diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-10-29 15:10:32 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-10-29 15:10:32 -0700 |
| commit | 1291d100f6b99e22bf8aee4fa30cc7b49f572722 (patch) | |
| tree | c870e67306a4c84da5fdc4074bc857264ff643fd | |
| parent | 05b76410d6d77a7a1304426ab90b2a8f4d2cfe07 (diff) | |
| download | subsurface-1291d100f6b99e22bf8aee4fa30cc7b49f572722.tar.gz | |
Ugly hack to work around broken Qt5.3.2 for Windows cross builds
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>
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 1 | ||||
| -rw-r--r-- | subsurface-install.pri | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index d34da5084..578847c4c 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -33,6 +33,7 @@ if [[ $1 == "Qt5-64" ]] ; then LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api \ QMAKE_LIBDIR+=../openssl \ CONFIG+=win64target \ + CONFIG+=brokenQt532win \ $BASEDIR/../../subsurface.pro elif [[ $1 == "Qt5" ]] ; then diff --git a/subsurface-install.pri b/subsurface-install.pri index be11b49bf..d3985ace1 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -125,6 +125,12 @@ mac { } nsis.depends += $$NSIINPUTFILE 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.target = installer installer.depends = nsis install |