diff options
author | kh1 <karsten.heimrich@digia.com> | 2013-01-21 12:46:54 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-01-23 11:09:21 +0100 |
commit | d5faa7a0286a4679f9e4b1594813c750e8580496 (patch) | |
tree | 1f2ab9fa4284201dd58e6d0f64b466f7dce1dd92 /src/libs | |
parent | 9b10e5eed91a1d17114304d97bd7f394c4265c58 (diff) |
Build 7z static to suppress warnings inside there.
Change-Id: Idcfec77f911f97358f8930c8f0d95fa1724daaeb
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/7zip/7zip.pri | 17 | ||||
-rw-r--r-- | src/libs/7zip/7zip.pro | 21 | ||||
-rw-r--r-- | src/libs/7zip/unix/unix.pri | 14 | ||||
-rw-r--r-- | src/libs/7zip/win/win.pri | 11 | ||||
-rw-r--r-- | src/libs/installer/installer.pro | 1 | ||||
-rw-r--r-- | src/libs/libs.pro | 2 |
6 files changed, 37 insertions, 29 deletions
diff --git a/src/libs/7zip/7zip.pri b/src/libs/7zip/7zip.pri index 1aa92d294..9285ddc17 100644 --- a/src/libs/7zip/7zip.pri +++ b/src/libs/7zip/7zip.pri @@ -1,4 +1,15 @@ -7ZIP_BASE=$$PWD +win32 { + 7ZIP_BASE=$$PWD/win + INCLUDEPATH += $$7ZIP_BASE/CPP + DEFINES += WIN_LONG_PATH _UNICODE +} -win32:include($$7ZIP_BASE/win/win.pri) #this is 7zip -unix:include($$7ZIP_BASE/unix/unix.pri) #this is p7zip +unix { + 7ZIP_BASE=$$PWD/unix + INCLUDEPATH += $$7ZIP_BASE/CPP \ + $$7ZIP_BASE/CPP/myWindows \ + $$7ZIP_BASE/CPP/include_windows + + macx:DEFINES += ENV_MACOSX + DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE NDEBUG _REENTRANT ENV_UNIX BREAK_HANDLER UNICODE _UNICODE +} diff --git a/src/libs/7zip/7zip.pro b/src/libs/7zip/7zip.pro new file mode 100644 index 000000000..9a10540e6 --- /dev/null +++ b/src/libs/7zip/7zip.pro @@ -0,0 +1,21 @@ +include(../../../installerfw.pri) + +QT = +TARGET = 7z +TEMPLATE = lib +INCLUDEPATH += . .. +CONFIG += staticlib +DESTDIR = $$IFW_LIB_PATH + +include(7zip.pri) +win32 { + DEFINES += _CRT_SECURE_NO_WARNINGS + CONFIG += no_batch # this is needed because we have a same named *.c and *.cpp file -> 7in + include($$7ZIP_BASE/win.pri) #this is 7zip +} + +unix { + QMAKE_CFLAGS += -w + QMAKE_CXXFLAGS += -fvisibility=hidden -w + include($$7ZIP_BASE/unix.pri) #this is p7zip +} diff --git a/src/libs/7zip/unix/unix.pri b/src/libs/7zip/unix/unix.pri index 8cc813cab..4bf4419f2 100644 --- a/src/libs/7zip/unix/unix.pri +++ b/src/libs/7zip/unix/unix.pri @@ -1,17 +1,3 @@ -isEmpty(7ZIP_BASE): 7ZIP_BASE = $$(7ZIP_BASE) -isEmpty(7ZIP_BASE): error(Please call qmake with 7ZIP_BASE=<path to nokia-sdk source directory> or add this line before you include that file in your pro file) - -7ZIP_BASE=$$7ZIP_BASE/unix - -DEFINES += _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE NDEBUG _REENTRANT ENV_UNIX BREAK_HANDLER UNICODE _UNICODE - -macx:DEFINES += ENV_MACOSX - -QMAKE_CXXFLAGS += -fvisibility=hidden - -INCLUDEPATH += $$7ZIP_BASE/CPP \ - $$7ZIP_BASE/CPP/myWindows \ - $$7ZIP_BASE/CPP/include_windows SOURCES += $$7ZIP_BASE/CPP/myWindows/myGetTickCount.cpp \ $$7ZIP_BASE/CPP/myWindows/wine_date_and_time.cpp \ diff --git a/src/libs/7zip/win/win.pri b/src/libs/7zip/win/win.pri index a02ae151b..d8bfbae82 100644 --- a/src/libs/7zip/win/win.pri +++ b/src/libs/7zip/win/win.pri @@ -1,14 +1,3 @@ -isEmpty(7ZIP_BASE): 7ZIP_BASE = $$(7ZIP_BASE) -isEmpty(7ZIP_BASE): error(Please call qmake with 7ZIP_BASE=<path to nokia-sdk source directory> or add this line before you include that file in your pro file) - -7ZIP_BASE=$$7ZIP_BASE/win - -CONFIG += no_batch # this is needed because we have a same named *.c and *.cpp file -> 7in - -DEFINES += WIN_LONG_PATH _UNICODE _CRT_SECURE_NO_WARNINGS - -INCLUDEPATH += $$7ZIP_BASE/CPP - #$(CONSOLE_OBJS): ../../UI/Console/$(*B).cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/BenchCon.cpp SOURCES += $$7ZIP_BASE/CPP/7zip/UI/Console/ConsoleClose.cpp diff --git a/src/libs/installer/installer.pro b/src/libs/installer/installer.pro index 57c3e3777..1f19e3e0d 100644 --- a/src/libs/installer/installer.pro +++ b/src/libs/installer/installer.pro @@ -167,6 +167,7 @@ macx { unix:!macx:SOURCES += adminauthorization_x11.cpp +LIBS += -l7z win32 { SOURCES += adminauthorization_win.cpp LIBS += -loleaut32 -luser32 # 7zip diff --git a/src/libs/libs.pro b/src/libs/libs.pro index b5712c29f..2189c02e7 100644 --- a/src/libs/libs.pro +++ b/src/libs/libs.pro @@ -1,3 +1,3 @@ CONFIG += ordered TEMPLATE = subdirs -SUBDIRS += installer +SUBDIRS += 7zip installer |