diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@nokia.com> | 2012-08-22 09:59:49 +0200 |
| commit | 27c1445c9f82434a39ada4c5fbf188d1ab09e5ba (patch) | |
| tree | 594d1c024ab8fc9a595e4ec5f8625b9222672563 /installerfw.pri | |
| parent | b22a0e8e6d1b3114fc37acad7e96b6b3564a8e19 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/installerfw.pri b/installerfw.pri index ba5fe9aa2..86618d6d3 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -45,6 +45,12 @@ INCLUDEPATH += \ win32:INCLUDEPATH += $$IFW_SOURCE_TREE/src/libs/7zip/win/CPP 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 +unix:!macx:LIBS += -lutil +macx:LIBS += -framework Carbon -framework Security + CONFIG += help uitools CONFIG(static, static|shared) { QTPLUGIN += qsqlite @@ -62,10 +68,3 @@ static { 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 } - -LIBS += -L$$IFW_LIB_PATH -# The order is important for a static compilation. The linker needs to parse libs/objects in dependency order. -equals(TEMPLATE, app):LIBS += -linstaller -unix:!macx:LIBS += -lutil -macx:LIBS += -framework Carbon -framework Security -win32:LIBS *= -lmpr # PQR for MinGW-w64: Added -lmpr for WNetGetUniversalName. |