equal
deleted
inserted
replaced
94 |
94 |
95 contains(QT_CONFIG, system-png) { |
95 contains(QT_CONFIG, system-png) { |
96 unix:LIBS_PRIVATE += -lpng |
96 unix:LIBS_PRIVATE += -lpng |
97 win32:LIBS += libpng.lib |
97 win32:LIBS += libpng.lib |
98 } else { |
98 } else { |
|
99 DEFINES *= QT_USE_BUNDLED_LIBPNG |
99 !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE |
100 !isEqual(QT_ARCH, i386):!isEqual(QT_ARCH, x86_64):DEFINES += PNG_NO_ASSEMBLER_CODE |
100 INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib |
101 INCLUDEPATH += ../3rdparty/libpng ../3rdparty/zlib |
101 SOURCES += ../3rdparty/libpng/png.c \ |
102 SOURCES += ../3rdparty/libpng/png.c \ |
102 ../3rdparty/libpng/pngerror.c \ |
103 ../3rdparty/libpng/pngerror.c \ |
103 ../3rdparty/libpng/pngget.c \ |
104 ../3rdparty/libpng/pngget.c \ |
110 ../3rdparty/libpng/pngset.c \ |
111 ../3rdparty/libpng/pngset.c \ |
111 ../3rdparty/libpng/pngtrans.c \ |
112 ../3rdparty/libpng/pngtrans.c \ |
112 ../3rdparty/libpng/pngwio.c \ |
113 ../3rdparty/libpng/pngwio.c \ |
113 ../3rdparty/libpng/pngwrite.c \ |
114 ../3rdparty/libpng/pngwrite.c \ |
114 ../3rdparty/libpng/pngwtran.c \ |
115 ../3rdparty/libpng/pngwtran.c \ |
115 ../3rdparty/libpng/pngwutil.c \ |
116 ../3rdparty/libpng/pngwutil.c |
116 ../3rdparty/libpng/pnggccrd.c |
|
117 } |
117 } |
118 } else { |
118 } else { |
119 DEFINES *= QT_NO_IMAGEFORMAT_PNG |
119 DEFINES *= QT_NO_IMAGEFORMAT_PNG |
120 } |
120 } |