diff options
| author | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2014-12-18 23:16:21 +0530 |
|---|---|---|
| committer | Ashish Kulkarni <kulkarni.ashish@gmail.com> | 2015-01-08 17:51:44 +0100 |
| commit | d45d8597cf2563052dab5d2473d2c0dd7cc2a853 (patch) | |
| tree | 1a236bdb23ad20498cfca80777d6309c14047aeb | |
| parent | ca1d4ca82d3eff0d1cbc645bb21da5e709c1ad57 (diff) | |
fix build on MSVC with system libraries for zlib, libpng and libjpeg
The definitions in qtbase were used as a source.
zlib => qtbase/src/3rdparty/zlib_dependency.pri
libpng => qtbase/src/gui/image/qpnghandler.pri
libjpeg => qtbase/src/gui/image/qjpeghandler.pri
Change-Id: I41529493d382d693311f3a2c1a2590bf1406baff
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | Source/WebCore/WebCore.pri | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 2a4dd3d2d..915a1a468 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -125,7 +125,11 @@ enable?(XSLT) { } use?(ZLIB) { - LIBS += -lz + if(unix|mingw):LIBS += -lz + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } enable?(NETSCAPE_PLUGIN_API) { @@ -248,8 +252,14 @@ have?(sqlite3) { use?(system_leveldb): LIBS += -lleveldb -lmemenv -use?(libjpeg): LIBS += -ljpeg -use?(libpng): LIBS += -lpng +use?(libjpeg) { + msvc: LIBS += libjpeg.lib + else: LIBS += -ljpeg +} +use?(libpng) { + if(unix|mingw): LIBS += -lpng + else:win32: LIBS += libpng.lib +} use?(webp): LIBS += -lwebp enable?(opencl) { |