equal
deleted
inserted
replaced
94 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) |
94 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) |
95 SOURCES += ../../corelib/kernel/qcore_mac.cpp |
95 SOURCES += ../../corelib/kernel/qcore_mac.cpp |
96 LIBS += -framework CoreServices |
96 LIBS += -framework CoreServices |
97 } |
97 } |
98 |
98 |
99 contains(QT_CONFIG, zlib)|cross_compile { |
99 if(contains(QT_CONFIG, zlib)|cross_compile):include(../../3rdparty/zlib.pri) |
100 INCLUDEPATH += ../../3rdparty/zlib |
100 else:include(../../3rdparty/zlib_dependency.pri) |
101 SOURCES+= \ |
|
102 ../3rdparty/zlib/adler32.c \ |
|
103 ../3rdparty/zlib/compress.c \ |
|
104 ../3rdparty/zlib/crc32.c \ |
|
105 ../3rdparty/zlib/deflate.c \ |
|
106 ../3rdparty/zlib/gzio.c \ |
|
107 ../3rdparty/zlib/inffast.c \ |
|
108 ../3rdparty/zlib/inflate.c \ |
|
109 ../3rdparty/zlib/inftrees.c \ |
|
110 ../3rdparty/zlib/trees.c \ |
|
111 ../3rdparty/zlib/uncompr.c \ |
|
112 ../3rdparty/zlib/zutil.c |
|
113 } |
|
114 |
101 |
115 lib.CONFIG = dummy_install |
102 lib.CONFIG = dummy_install |
116 INSTALLS += lib |
103 INSTALLS += lib |
117 |
104 |
118 # Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. |
105 # Make dummy "sis" and "freeze" target to keep recursive "make sis/freeze" working. |