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

Fix "make install" on Windows with srcdir != builddir

Browse source 
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Thiago Macieira 2013-11-27 17:42:45 -08:00 • committed by Dirk Hohndel
parent ca819b2a09
commit 586437df89
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
subsurface-install.pri
View file

@ -42,8 +42,8 @@ mac {
# which libs we need. # which libs we need.
# The only target is "make install", which copies everything into packaging/windows # The only target is "make install", which copies everything into packaging/windows
WINDOWSSTAGING = packaging/windows WINDOWSSTAGING = packaging/windows
NSIFILE = $$WINDOWSSTAGING/subsurface.nsi NSIFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi
NSIINPUTFILE = $$WINDOWSSTAGING/subsurface.nsi.in NSIINPUTFILE = $$PWD/$$WINDOWSSTAGING/subsurface.nsi.in
MAKENSIS = /usr/bin/makensis MAKENSIS = /usr/bin/makensis
deploy.path = $$WINDOWSSTAGING deploy.path = $$WINDOWSSTAGING
@ -65,8 +65,8 @@ mac {
dlls.commands += perl $$PWD/scripts/win-ldd.pl dlls.commands += perl $$PWD/scripts/win-ldd.pl
# equals(QMAKE_HOST.os, "Windows"): EXE_SUFFIX = .exe # equals(QMAKE_HOST.os, "Windows"): EXE_SUFFIX = .exe
EXE_SUFFIX = .exe EXE_SUFFIX = .exe
CONFIG(debug, debug|release): dlls.commands += $$PWD/debug/subsurface$$EXE_SUFFIX CONFIG(debug, debug|release): dlls.commands += $$OUT_PWD/debug/subsurface$$EXE_SUFFIX
else: dlls.commands += $$PWD/release/$$TARGET$$EXE_SUFFIX else: dlls.commands += $$OUT_PWD/release/$$TARGET$$EXE_SUFFIX
for(plugin, $$list($$DEPLOYMENT_PLUGIN)) { for(plugin, $$list($$DEPLOYMENT_PLUGIN)) {
CONFIG(debug, debug|release): dlls.depends += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll CONFIG(debug, debug|release): dlls.depends += $$[QT_INSTALL_PLUGINS]/$${plugin}d4.dll