diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-10-23 17:09:23 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-10-23 17:09:23 +0200 |
| commit | 7778787b91a9ec75a3fcba70b7d39d64a034997c (patch) | |
| tree | e589d8bea9713e38111c0b640a2cf63a425585b2 /installerfw.pri | |
| parent | 5cc89ac1eab55dfbd8a1ad754cbb2c8f7c424abc (diff) | |
| parent | 53b999af27bf2272445b882c055aa6cf8335c74a (diff) | |
Merge remote-tracking branch 'origin/1.4' into 1.5
Change-Id: Ib2d382d1aa398b642dc15f4df7c03b19bf638546
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/installerfw.pri b/installerfw.pri index ad559c410..62a82b6d9 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -56,6 +56,9 @@ unix:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/unix/CPP LIBS += -L$$IFW_LIB_PATH # The order is important. The linker needs to parse archives in reversed dependency order. equals(TEMPLATE, app):LIBS += -linstaller +win32:equals(TEMPLATE, app) { + LIBS += -luser32 +} unix:!macx:LIBS += -lutil macx:LIBS += -framework Carbon -framework Security @@ -106,6 +109,9 @@ static { LIBS += -l7z win32-g++*: LIBS += -lmpr -luuid - win32:exists($$IFW_LIB_PATH/installer.lib):POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib - unix:exists($$IFW_LIB_PATH/libinstaller.a):POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a + equals(TEMPLATE, app) { + win32-msvc*:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib + win32-g++*:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a + unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a + } } |