diff options
| author | Constantin Makshin <cmakshin@gmail.com> | 2010-06-10 14:38:42 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-06-10 14:38:42 (GMT) |
| commit | 66539b167c01968f3040bfad9a59561a8b253639 (patch) | |
| tree | 67a688b641fecf7a9a3acafe3f6dc594425aa39e /src/tools | |
| parent | 2d8a4862d09e2d77c0c3ed0f297c3d27b179db08 (diff) | |
| download | Qt-66539b167c01968f3040bfad9a59561a8b253639.zip Qt-66539b167c01968f3040bfad9a59561a8b253639.tar.gz Qt-66539b167c01968f3040bfad9a59561a8b253639.tar.bz2 | |
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>)
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 5 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index 1de7b18..1aa8121 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -52,8 +52,9 @@ hpux-acc*|hpuxi-acc* { LIBS += -lbootstrap } !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile { - unix:LIBS += -lz -# win32:LIBS += libz.lib + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib } win32:LIBS += -luser32 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 44dd625..149291a 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -109,6 +109,10 @@ contains(QT_CONFIG, zlib)|cross_compile { ../3rdparty/zlib/trees.c \ ../3rdparty/zlib/uncompr.c \ ../3rdparty/zlib/zutil.c +} else:!contains(QT_CONFIG, no-zlib) { + symbian:LIBS_PRIVATE += -llibz + else:if(unix|win32-g++*):LIBS_PRIVATE += -lz + else:LIBS += zdll.lib } lib.CONFIG = dummy_install |