summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--installerfw.pri6
-rw-r--r--src/libs/7zip/7zip.pro3
2 files changed, 5 insertions, 4 deletions
diff --git a/installerfw.pri b/installerfw.pri
index 4a42d3325..ba24910df 100644
--- a/installerfw.pri
+++ b/installerfw.pri
@@ -106,6 +106,8 @@ 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:POST_TARGETDEPS += $$IFW_LIB_PATH/installer.lib $$IFW_LIB_PATH/7z.lib
+ unix:POST_TARGETDEPS += $$IFW_LIB_PATH/libinstaller.a $$IFW_LIB_PATH/lib7z.a
+ }
}
diff --git a/src/libs/7zip/7zip.pro b/src/libs/7zip/7zip.pro
index 549778e67..01b69dad2 100644
--- a/src/libs/7zip/7zip.pro
+++ b/src/libs/7zip/7zip.pro
@@ -1,8 +1,7 @@
-include(../../../installerfw.pri)
-
QT = core
TARGET = 7z
TEMPLATE = lib
+include(../../../installerfw.pri)
INCLUDEPATH += . ..
CONFIG += staticlib
DESTDIR = $$IFW_LIB_PATH