--- a/src/tools/bootstrap/bootstrap.pro Tue Jul 06 15:10:48 2010 +0300
+++ b/src/tools/bootstrap/bootstrap.pro Wed Aug 18 10:37:55 2010 +0300
@@ -96,21 +96,8 @@
LIBS += -framework CoreServices
}
-contains(QT_CONFIG, zlib)|cross_compile {
- INCLUDEPATH += ../../3rdparty/zlib
- SOURCES+= \
- ../3rdparty/zlib/adler32.c \
- ../3rdparty/zlib/compress.c \
- ../3rdparty/zlib/crc32.c \
- ../3rdparty/zlib/deflate.c \
- ../3rdparty/zlib/gzio.c \
- ../3rdparty/zlib/inffast.c \
- ../3rdparty/zlib/inflate.c \
- ../3rdparty/zlib/inftrees.c \
- ../3rdparty/zlib/trees.c \
- ../3rdparty/zlib/uncompr.c \
- ../3rdparty/zlib/zutil.c
-}
+if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri)
+else:include(../../3rdparty/zlib_dependency.pri)
lib.CONFIG = dummy_install
INSTALLS += lib