Make png work

This commit is contained in:
Harald Oehlmann 2017-01-18 18:07:17 +01:00
parent 1863399956
commit ffc9c441f7
3 changed files with 5 additions and 4 deletions

View File

@ -19,7 +19,7 @@ TARGET = QtZint
INCLUDEPATH += ../backend
#EDIT THIS !!!!
DEFINES += ZINT_VERSION="\\\"2.5.0\\\""
DEFINES += ZINT_VERSION="\\\"2.5.1\\\""
!contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng

View File

@ -61,9 +61,9 @@ QMAKE_LIBDIR += ../backend_qt/release
!contains(DEFINES, NO_PNG) {
# Win
win32:LIBS += -llibpng16 -zlib
win32:LIBS += -llibpng16 -lzlib
win32:QMAKE_LIBDIR+="../../lpng/projects/vstudio/Release Library"
# Unix
unix:LIBS += -lpng -zlib
unix:QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/
#unix:LIBS += -lpng -zlib
#unix:QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/
}

View File

@ -18,6 +18,7 @@ Folder structure:
Build libpng:
Open $ZH\..\lpng\projects\vstudio with VS2015 gui and convert the project
Set Project settings->C++->Code Generation->Library: Multi-Threadded DLL /MD
Copy the zlib source as required by the make file (in my case: zlib-1.2.8)
Build targets "Release Library" for zlib and libpng.