ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/s10k/CommonLibs/CommonLibs.pri
(Generate patch)

Comparing s10k/CommonLibs/CommonLibs.pri (file contents):
Revision 1096 by s10k, Sat Dec 30 14:40:33 2017 UTC vs.
Revision 1110 by s10k, Sat Feb 16 17:24:18 2019 UTC

# Line 1 | Line 1
1 < INCLUDEPATH+=$$PWD
2 < DEPENDPATH+=$$PWD
3 < #include($$PWD/CommonLibs.pro)
4 <
5 < HEADERS  += \
6 <    $$PWD/pugixml/pugiconfig.hpp \
7 <    $$PWD/cpp17optional/optional.hpp \
8 <    $$PWD/plog/Log.h \
9 <    $$PWD/pugixml/pugixml.hpp \
10 <        $$PWD/ConditionalSemaphore/conditionalsemaphore.h
11 <
12 < SOURCES += \
13 <    $$PWD/pugixml/pugixml.cpp  \
14 <        $$PWD/ConditionalSemaphore/conditionalsemaphore.cpp
15 <
16 < contains(QT, gui){
17 < SOURCES += \
18 <    $$PWD/jsonhighlighter/highlighter.cpp \
19 <        $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
20 <    $$PWD/CustomTreeWidget/customtreewidget.cpp \
21 <        $$PWD/LineNumberDisplay/LineNumberDisplay.cpp
22 < }
23 <
24 < contains(QT, gui){
25 < HEADERS  += \
26 <    $$PWD/jsonhighlighter/highlighter.h  \
27 <        $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
28 <    $$PWD/CustomTreeWidget/customtreewidget.h \
29 <        $$PWD/LineNumberDisplay/LineNumberDisplay.h
30 < }
31 <
32 < # Extra libs
33 < quazip {
34 <        LIBS += -L$$PWD/zlib-1.2.8 -lz
35 <
36 <        win32 {
37 <        LIBS += -L$$PWD/quazip-0.7.2/quazip/release -lquazip
38 <        }
39 <
40 <        macx {
41 <        LIBS += -L$$PWD/quazip-0.7.2/quazip -lquazip
42 <        }
43 <        
44 <        INCLUDEPATH += $$PWD/zlib-1.2.8 \
45 <        $$PWD/quazip-0.7.2/quazip
46 < }
47 <
48 < contains(QT, gui){
49 < INCLUDEPATH += \
50 <    $$PWD/CustomTreeWidget # this one is global so we can use it to promote widgets in qt creator
51 < }
52 < # (http://stackoverflow.com/questions/18471827/qtcreator-cant-find-the-class-header-file-after-promoting-a-widget-to-that-clas)
53 < # $$PWD/pugixml
1 > INCLUDEPATH+=$$PWD
2 > DEPENDPATH+=$$PWD
3 > #include($$PWD/CommonLibs.pro)
4 >
5 > HEADERS  += \
6 >    $$PWD/pugixml/pugiconfig.hpp \
7 >    $$PWD/cpp17optional/optional.hpp \
8 >    $$PWD/plog/Log.h \
9 >    $$PWD/pugixml/pugixml.hpp \
10 >        $$PWD/ConditionalSemaphore/conditionalsemaphore.h
11 >
12 > SOURCES += \
13 >    $$PWD/pugixml/pugixml.cpp  \
14 >        $$PWD/ConditionalSemaphore/conditionalsemaphore.cpp
15 >
16 > contains(QT, gui){
17 > SOURCES += \
18 >    $$PWD/jsonhighlighter/highlighter.cpp \
19 >        $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
20 >    $$PWD/CustomTreeWidget/customtreewidget.cpp \
21 >        $$PWD/LineNumberDisplay/LineNumberDisplay.cpp
22 > }
23 >
24 > contains(QT, gui){
25 > HEADERS  += \
26 >    $$PWD/jsonhighlighter/highlighter.h  \
27 >        $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
28 >    $$PWD/CustomTreeWidget/customtreewidget.h \
29 >        $$PWD/LineNumberDisplay/LineNumberDisplay.h
30 > }
31 >
32 > # Extra libs
33 > quazip {
34 >        LIBS += -L$$PWD/zlib-1.2.8 -lz
35 >
36 >        win32 {
37 >        LIBS += -L$$PWD/quazip-0.7.2/quazip/release -lquazip
38 >        }
39 >
40 >        macx {
41 >        LIBS += -L$$PWD/quazip-0.7.2/quazip -lquazip
42 >        }
43 >        
44 >        INCLUDEPATH += $$PWD/zlib-1.2.8 \
45 >        $$PWD/quazip-0.7.2/quazip
46 > }
47 >
48 > contains(QT, gui){
49 > INCLUDEPATH += \
50 >    $$PWD/CustomTreeWidget # this one is global so we can use it to promote widgets in qt creator
51 > }
52 > # (http://stackoverflow.com/questions/18471827/qtcreator-cant-find-the-class-header-file-after-promoting-a-widget-to-that-clas)
53 > # $$PWD/pugixml

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)