diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-08-02 15:06:10 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-08-02 15:08:22 -0700 |
| commit | 6c15647858e866d1366de57f49e52a4a2b69aa0f (patch) | |
| tree | e2f4a7829d2f1556c40b4c1294ed73bfd625e754 /packaging | |
| parent | a104905257876b8b25c5ff06f1fc41f8f87ee34f (diff) | |
| download | subsurface-6c15647858e866d1366de57f49e52a4a2b69aa0f.tar.gz | |
Allow cross-building 64 bit binaries for Windows
This also makes sure that we package the Qt5 translations, not the Qt4
translations.
There was an odd issue that somehow a 32bit search path ended up being
used by win-dll which resulted in the wrong DLLs being packaged.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 22 | ||||
| -rw-r--r-- | packaging/windows/subsurface.nsi.in | 4 |
2 files changed, 20 insertions, 6 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 387620978..e9a55ba3a 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -14,10 +14,28 @@ BASEDIR=$(dirname $0) rm $BASEDIR/subsurface.nsi > /dev/null 2>&1 rm $BASEDIR/../../ssrf-version.h > /dev/null 2>&1 -export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH +if [[ $1 == "Qt5-64" ]] ; then + export PATH=/usr/x86_64-w64-mingw32/sys-root/mingw/bin:$PATH +else + export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH +fi export objdump=mingw-objdump -if [[ $1 == "Qt5" ]] ; then +if [[ $1 == "Qt5-64" ]] ; then + shift + mingw64-qmake-qt5 \ + CROSS_PATH=/usr/x86_64-w64-mingw32/sys-root/mingw \ + QMAKE_LRELEASE=/usr/x86_64-w64-mingw32/bin/qt5/lrelease \ + QMAKE_MOC=/usr/x86_64-w64-mingw32/bin/qt5/moc \ + QMAKE_UIC=/usr/x86_64-w64-mingw32/bin/qt5/uic \ + QMAKE_RCC=/usr/x86_64-w64-mingw32/bin/qt5/rcc \ + LIBDCDEVEL=../libdivecomputer \ + LIBMARBLEDEVEL=../marble \ + LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ + QMAKE_LIBDIR+=../openssl \ + $BASEDIR/../../subsurface.pro + +elif [[ $1 == "Qt5" ]] ; then shift mingw32-qmake-qt5 \ CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw \ diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 9190c50e0..f1af9e9e5 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -4,10 +4,6 @@ # This installer creator needs to be run with: # makensis subsurface.nsi # -# It assumes that packaging/windows/dll is a symlink to -# the directory in which the required Windows DLLs are installed -# (in my case that's /usr/i686-w64-mingw32/sys-root/mingw/bin) -# #-------------------------------- # Include Modern UI |