diff options
| author | tjenssen <tim.jenssen@nokia.com> | 2012-08-08 17:31:38 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-10 13:12:47 +0200 |
| commit | 9cad5d54cf0d78e92b4ee831299d83b657f42f2e (patch) | |
| tree | e1914be8eadfd06ad64ff5dd31d200a4cf95df86 /installerfw.pri | |
| parent | 0188b08e8dc218fb66f59522ffa7c02643a9577a (diff) | |
Fixes required for errorless MinGW-w64 compilation are done.
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'installerfw.pri')
| -rw-r--r-- | installerfw.pri | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/installerfw.pri b/installerfw.pri index 86618d6d3..ba5fe9aa2 100644 --- a/installerfw.pri +++ b/installerfw.pri @@ -45,12 +45,6 @@ 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 @@ -68,3 +62,10 @@ 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. |