Mercurial > hg > mxe
view src/qtimageformats-1-cherrypicks.patch @ 3017:007e64949404 draft
packages gtkglarea libglade libzip qdbm sdl_gfx: use $(WGET) variable
| author | Tony Theodore <tonyt@logyst.com> |
|---|---|
| date | Fri, 21 Dec 2012 18:09:54 +1100 |
| parents | 42060c7885ed |
| children |
line wrap: on
line source
This file is part of MXE. See index.html for further information. From c75cecf3ceb1d174887ae0029b2c57bfe71f9463 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Thu, 3 Nov 2011 14:11:02 +0100 Subject: [PATCH 1/2] add pkg-config support for libtiff-4 Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro index 60ba7d1..0544f55 100644 --- a/config.tests/libtiff/libtiff.pro +++ b/config.tests/libtiff/libtiff.pro @@ -1,4 +1,7 @@ SOURCES = libtiff.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle -LIBS += -ltiff +CONFIG += link_pkgconfig +packagesExist(libtiff-4):PKGCONFIG += libtiff-4 +else:if(unix|win32-g++*): LIBS += -ltiff +else:win32: LIBS += libtiff.lib diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro index 66eea8c..8582740 100644 --- a/src/plugins/imageformats/tiff/tiff.pro +++ b/src/plugins/imageformats/tiff/tiff.pro @@ -9,7 +9,9 @@ SOURCES += main.cpp qtiffhandler.cpp OTHER_FILES += tiff.json config_libtiff { - unix|win32-g++*: LIBS += -ltiff + CONFIG += link_pkgconfig + packagesExist(libtiff-4):PKGCONFIG += libtiff-4 + else:if(unix|win32-g++*): LIBS += -ltiff else:win32: LIBS += libtiff.lib } else { include($$PWD/../../../3rdparty/libtiff.pri) -- 1.7.10.4 From b169f5342cb224b1afa16062f02f4303bab91122 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Wed, 19 Dec 2012 23:29:52 +0100 Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific) Change-Id: I1216f35a01a974321efa2463b687c121baa22667 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro index ee57ecd..4c2d305 100644 --- a/config.tests/libmng/libmng.pro +++ b/config.tests/libmng/libmng.pro @@ -1,4 +1,7 @@ SOURCES = libmng.cpp CONFIG -= qt dylib mac:CONFIG -= app_bundle -LIBS += -lmng +CONFIG += link_pkgconfig +packagesExist(libmng):PKGCONFIG += libmng +else:if(unix|win32-g++*): LIBS += -lmng +else:win32: LIBS += libmng.lib diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro index 9890c11..7cfcff0 100644 --- a/src/plugins/imageformats/mng/mng.pro +++ b/src/plugins/imageformats/mng/mng.pro @@ -8,7 +8,9 @@ HEADERS += qmnghandler_p.h SOURCES += qmnghandler.cpp OTHER_FILES += mng.json config_libmng { - unix|win32-g++*: LIBS += -lmng + CONFIG += link_pkgconfig + packagesExist(libmng):PKGCONFIG += libmng + else:if(unix|win32-g++*): LIBS += -lmng else:win32: LIBS += libmng.lib } else { include($$PWD/../../../3rdparty/libmng.pri) -- 1.7.10.4