--- s10k/CommonLibs/CommonLibs.pri 2017/10/05 17:48:32 1073 +++ s10k/CommonLibs/CommonLibs.pri 2019/02/16 17:24:18 1110 @@ -2,25 +2,47 @@ INCLUDEPATH+=$$PWD DEPENDPATH+=$$PWD #include($$PWD/CommonLibs.pro) +HEADERS += \ + $$PWD/pugixml/pugiconfig.hpp \ + $$PWD/cpp17optional/optional.hpp \ + $$PWD/plog/Log.h \ + $$PWD/pugixml/pugixml.hpp \ + $$PWD/ConditionalSemaphore/conditionalsemaphore.h + SOURCES += \ - $$PWD/pugixml/pugixml.cpp \ + $$PWD/pugixml/pugixml.cpp \ + $$PWD/ConditionalSemaphore/conditionalsemaphore.cpp contains(QT, gui){ SOURCES += \ $$PWD/jsonhighlighter/highlighter.cpp \ - $$PWD/CustomTreeWidget/customtreewidget.cpp + $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \ + $$PWD/CustomTreeWidget/customtreewidget.cpp \ + $$PWD/LineNumberDisplay/LineNumberDisplay.cpp } -HEADERS += \ - $$PWD/pugixml/pugiconfig.hpp \ - $$PWD/cpp17optional/optional.hpp \ - $$PWD/plog/Log.h \ - $$PWD/pugixml/pugixml.hpp - contains(QT, gui){ HEADERS += \ $$PWD/jsonhighlighter/highlighter.h \ - $$PWD/CustomTreeWidget/customtreewidget.h + $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \ + $$PWD/CustomTreeWidget/customtreewidget.h \ + $$PWD/LineNumberDisplay/LineNumberDisplay.h +} + +# Extra libs +quazip { + LIBS += -L$$PWD/zlib-1.2.8 -lz + + win32 { + LIBS += -L$$PWD/quazip-0.7.2/quazip/release -lquazip + } + + macx { + LIBS += -L$$PWD/quazip-0.7.2/quazip -lquazip + } + + INCLUDEPATH += $$PWD/zlib-1.2.8 \ + $$PWD/quazip-0.7.2/quazip } contains(QT, gui){