diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-06-06 09:15:36 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-06 09:18:13 -0700 |
| commit | 049b6c0426cdcadf566beb0c6286e4ae9595bc95 (patch) | |
| tree | 389b8745121534fbf52917397e950c277c322c7e /packaging/windows | |
| parent | cc22a9876647e2393756164eed25bd09354411cb (diff) | |
| download | subsurface-049b6c0426cdcadf566beb0c6286e4ae9595bc95.tar.gz | |
Prepare for Qt4 / Qt5 cross builds of Windows binaries
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>
Diffstat (limited to 'packaging/windows')
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 30 | ||||
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 21 |
2 files changed, 27 insertions, 24 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 2348aa21b..30374a3e6 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -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 objdump=mingw-objdump -mingw32-qmake-qt4 \ - CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ - LIBDCDEVEL=../libdivecomputer \ - LIBMARBLEDEVEL=../marble \ - LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ - $BASEDIR/../../subsurface.pro + +if [[ $1 == "Qt5" ]] ; then + shift + mingw32-qmake-qt5 \ + CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ + 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 $@ diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 24b502ff9..f32deefc7 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -98,30 +98,15 @@ Section Delete "$INSTDIR\*.dll" # 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 /r data File /r images File /r plugins File /r Documentation File /r translations - File iconv.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 *.dll File subsurface.ico File qt.conf |