mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-29 14:25:23 -04:00
- cmake: remove zintconfig.h.in for now as incompatible with MSVC
project builds (will add back in future if go fully CMake) - NO_PNG -> ZINT_NO_PNG and new API function `Zint_NoPng()` to determine if no PNG support in libzint; replace use in GUI with backend_qt method `noPng()`
This commit is contained in:
parent
536a581d9e
commit
6393813cff
31 changed files with 138 additions and 156 deletions
|
@ -4,7 +4,7 @@ DEPENDPATH += . debug release
|
|||
INCLUDEPATH += .
|
||||
INCLUDEPATH += ../backend
|
||||
INCLUDEPATH += ../backend_qt
|
||||
!contains(DEFINES, NO_PNG) {
|
||||
!contains(DEFINES, ZINT_NO_PNG) {
|
||||
INCLUDEPATH += ../../lpng
|
||||
INCLUDEPATH += ../../zlib
|
||||
}
|
||||
|
@ -82,7 +82,7 @@ QMAKE_LIBDIR += ../backend_qt/release
|
|||
LIBS += -lQt5Core
|
||||
QMAKE_LIBDIR += C:/qt/5.15.2static/lib
|
||||
|
||||
!contains(DEFINES, NO_PNG) {
|
||||
!contains(DEFINES, ZINT_NO_PNG) {
|
||||
# Win
|
||||
win32:LIBS += -llibpng16 -lzlib
|
||||
win32:QMAKE_LIBDIR+="../../lpng/projects/vstudio/Release Library"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue