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

Ugly hack to work around broken Qt5.3.2 for Windows cross builds

Browse source 
Checking this in to make sure I don't end up creating broken installers
again. I doubt that this is useful for anyone but me - but then, I don't
think anyone but me creates Windows installers.

Background - when Fedora 20 updated the cross-built version of Qt for
Win64 something broke. Subsurfae installed with those DLLs will crash.
Replacing the older 5.3.1 DLLs fixes this for now, so I have a directory
with just those DLLs and simply replace them in the staging directory
before calling makensis.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-10-29 15:10:32 -07:00
parent 05b76410d6
commit 1291d100f6
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,7 @@ if [[ $1 == "Qt5-64" ]] ; then
LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \
QMAKE_LIBDIR+=../openssl \ QMAKE_LIBDIR+=../openssl \
CONFIG+=win64target \ CONFIG+=win64target \
CONFIG+=brokenQt532win \
$BASEDIR/../../subsurface.pro $BASEDIR/../../subsurface.pro
elif [[ $1 == "Qt5" ]] ; then elif [[ $1 == "Qt5" ]] ; then

6
subsurface-install.pri
View file

@ -125,6 +125,12 @@ mac {
} }
nsis.depends += $$NSIINPUTFILE nsis.depends += $$NSIINPUTFILE
nsis.target = $$NSISFILE nsis.target = $$NSISFILE
#
# FIXME HACK HACK FIXME -- this is needed to create working daily builds...
#
brokenQt532win {
installer.commands += cp Qt531/*.dll staging;
}
installer.commands += $$MAKENSIS $$NSIFILE installer.commands += $$MAKENSIS $$NSIFILE
installer.target = installer installer.target = installer
installer.depends = nsis install installer.depends = nsis install