mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prepare for Qt4 / Qt5 cross builds of Windows binaries

Browse source 
Admittedly I believe I'm the only one using this script (and related .nsi
file), it still seems to make sense to keep it up to date in the
repository.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-06 09:15:36 -07:00
parent cc22a98766
commit 049b6c0426
2 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packaging/windows/mingw-make.sh
View file

@ -16,10 +16,28 @@ rm $BASEDIR/../../ssrf-version.h > /dev/null 2>&1
export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
export objdump=mingw-objdump export objdump=mingw-objdump
mingw32-qmake-qt4 \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ if [[ $1 == "Qt5" ]] ; then
LIBDCDEVEL=../libdivecomputer \ shift
LIBMARBLEDEVEL=../marble \ mingw32-qmake-qt5 \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
$BASEDIR/../../subsurface.pro QMAKE_LRELEASE=/usr/i686-w64-mingw32/bin/qt5/lrelease \
QMAKE_MOC=/usr/i686-w64-mingw32/bin/qt5/moc \
QMAKE_UIC=/usr/i686-w64-mingw32/bin/qt5/uic \
QMAKE_RCC=/usr/i686-w64-mingw32/bin/qt5/rcc \
LIBDCDEVEL=../libdivecomputer \
LIBMARBLEDEVEL=../marble \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
$BASEDIR/../../subsurface.pro
else
mingw32-qmake-qt4 \
CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \
LIBDCDEVEL=../libdivecomputer \
LIBMARBLEDEVEL=../marble \
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
$BASEDIR/../../subsurface.pro
fi
mingw32-make $@ mingw32-make $@

21
packaging/windows/subsurface.nsi.in
View file

@ -98,30 +98,15 @@ Section
Delete "$INSTDIR\*.dll" Delete "$INSTDIR\*.dll"
# Files to include in installer # Files to include in installer
# now that we install into the staging directory and try to only have
# the DLLs there that we depend on, this is much easier
File subsurface.exe File subsurface.exe
File /r data File /r data
File /r images File /r images
File /r plugins File /r plugins
File /r Documentation File /r Documentation
File /r translations File /r translations
File iconv.dll File *.dll
File libpng16-16.dll
File libjpeg-*.dll
File libusb-1.0.dll
File libxml2-2.dll
File libxslt-1.dll
File zlib1.dll
File libzip*.dll
File libsqlite3-0.dll
File libgcc_s_sjlj-1.dll
File libstdc++-6.dll
File libmarblewidget*dll
File libssl-10.dll
File libeay32.dll
File ssleay32.dll
File libgit2.dll
File libcrypto-10.dll
File Qt*4.dll
File subsurface.ico File subsurface.ico
File qt.conf File qt.conf