From 33e644acb191399c4bbfa0cced586e1282694177 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Mon, 14 Aug 2017 14:15:55 +0200 Subject: [PATCH] update png script --- .../imageformats/apng => 3rdparty}/.gitignore | 0 src/plugins/imageformats/apng/apng.pro | 20 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) rename src/{plugins/imageformats/apng => 3rdparty}/.gitignore (100%) diff --git a/src/plugins/imageformats/apng/.gitignore b/src/3rdparty/.gitignore similarity index 100% rename from src/plugins/imageformats/apng/.gitignore rename to src/3rdparty/.gitignore diff --git a/src/plugins/imageformats/apng/apng.pro b/src/plugins/imageformats/apng/apng.pro index 84d2439..390bb7e 100644 --- a/src/plugins/imageformats/apng/apng.pro +++ b/src/plugins/imageformats/apng/apng.pro @@ -16,18 +16,18 @@ CONFIG += link_pkgconfig unix:PKGCONFIG += libpng else:LIBS += -lpng } else { - win32:CONFIG(release, debug|release): LIBS += -L$$PWD/libpng/lib/ -lpng - else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/libpng/lib/ -lpngd - else:unix: LIBS += -L$$PWD/libpng/lib/ -lpng + win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../../3rdparty/libpng/lib/ -lpng + else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../../3rdparty/libpng/lib/ -lpngd + else:unix: LIBS += -L$$PWD/../../../3rdparty/libpng/lib/ -lpng - INCLUDEPATH += $$PWD/libpng/include - DEPENDPATH += $$PWD/libpng/include + INCLUDEPATH += $$PWD/../../../3rdparty/libpng/include + DEPENDPATH += $$PWD/../../../3rdparty/libpng/include - win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/libpng/lib/libpng.a - else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/libpng/lib/libpngd.a - else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/libpng/lib/png.lib - else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/libpng/lib/pngd.lib - else:unix: PRE_TARGETDEPS += $$PWD/libpng/lib/libpng.a + win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../../3rdparty/libpng/lib/libpng.a + else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../../3rdparty/libpng/lib/libpngd.a + else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$PWD/../../../3rdparty/libpng/lib/png.lib + else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$PWD/../../../3rdparty/libpng/lib/pngd.lib + else:unix: PRE_TARGETDEPS += $$PWD/../../../3rdparty/libpng/lib/libpng.a } PLUGIN_TYPE = imageformats