ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/s10k/Vago/Vago.pro

Comparing Vago/trunk/Vago/Vago.pro (file contents):
Revision 999 by s10k, Sat Apr 26 12:40:47 2014 UTC vs.
Revision 1058 by s10k, Sun Oct 30 14:42:39 2016 UTC

#	Line 7 | Line 7
7		QT       += widgets
8		QT       += network #network communication
9		QT       += script #for json parse
10	+	win32 {
11	+	QT       += winextras
12	+	}
13	+	CONFIG   += c++14
14
15	<	INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
12	<	INCLUDEPATH += ./libs
15	>	#INCLUDEPATH += ./libs
16		INCLUDEPATH += ./packageWizard
17		INCLUDEPATH += ./soundWizard
18	+	INCLUDEPATH += ./bgImageWizard
19	+	INCLUDEPATH += ./xmlToolsInterface
20	+
21	+	# Used this great tutorial to build zlib and quazip:
22	+	# http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
23	+	INCLUDEPATH += ../Libs/zlib-1.2.8
24	+	LIBS += -L../Libs/zlib-1.2.8 -lz
25	+	INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
26	+	win32 {
27	+	LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
28	+	}
29	+	macx {
30	+	LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
31	+	}
32
33		macx {
34		LIBS += -lz # for mac support zipping (thanks edt!)
#	Line 35 | Line 52 | SOURCES += \
52		droptablewidget.cpp \
53		converter.cpp \
54		about.cpp \
38	–	libs/zipglobal.cpp \
39	–	libs/zip.cpp \
40	–	libs/unzip.cpp \
55		packageWizard/packagewizard.cpp \
56		packageWizard/packagepagefinal.cpp \
57		packageWizard/packagepage4.cpp \
#	Line 46 | Line 60 | SOURCES += \
60		soundWizard/soundpage2.cpp \
61		soundWizard/soundpage3.cpp \
62		soundWizard/soundpage4.cpp \
63	+	soundWizard/soundpage5.cpp \
64		soundWizard/soundpagefinal.cpp \
65		soundWizard/soundwizard.cpp \
66	<	xmlprocessor.cpp
66	>	bgImageWizard/bgimagepage2.cpp \
67	>	xmlprocessor.cpp \
68	>	libs/pugixml/pugixml.cpp \
69	>	utilvago.cpp \
70	>	bgImageWizard/bgimagewizard.cpp \
71	>	bgImageWizard/bgimagepage3.cpp \
72	>	bgImageWizard/bgimagepagefinal.cpp \
73	>	xmlToolsInterface/xmltoolsinterface.cpp \
74	>	libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
75	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
76	>	libs/LineNumberDisplay/LineNumberDisplay.cpp
77
78		HEADERS  += \
79		util.h \
#	Line 59 | Line 84 | HEADERS  += \
84		droptablewidget.h \
85		converter.h \
86		about.h \
62	–	libs/zipglobal.h \
63	–	libs/zipentry_p.h \
64	–	libs/zip_p.h \
65	–	libs/zip.h \
66	–	libs/unzip_p.h \
67	–	libs/unzip.h \
87		packageWizard/packagewizard.h \
88		packageWizard/packagepagefinal.h \
89		packageWizard/packagepage4.h \
#	Line 73 | Line 92 | HEADERS  += \
92		soundWizard/soundpage2.h \
93		soundWizard/soundpage3.h \
94		soundWizard/soundpage4.h \
95	+	soundWizard/soundpage5.h \
96		soundWizard/soundpagefinal.h \
97		soundWizard/soundwizard.h \
98	<	xmlprocessor.h
98	>	bgImageWizard/bgimagepage2.h \
99	>	xmlprocessor.h \
100	>	libs/pugixml/pugixml.hpp \
101	>	utilvago.h \
102	>	bgImageWizard/bgimagewizard.h \
103	>	bgImageWizard/bgimagepage3.h \
104	>	bgImageWizard/bgimagepagefinal.h \
105	>	xmlToolsInterface/xmltoolsinterface.h \
106	>	libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
107	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
108	>	libs/LineNumberDisplay/LineNumberDisplay.h
109
110	<	FORMS    += mainwindow.ui \
110	>	FORMS    += \
111	>	mainwindow.ui \
112		preferences.ui \
113		manualcommands.ui \
114		about.ui \
#	Line 88 | Line 119 | FORMS    += mainwindow.ui \
119		soundWizard/soundpage2.ui \
120		soundWizard/soundpage3.ui \
121		soundWizard/soundpage4.ui \
122	<	soundWizard/soundpagefinal.ui
122	>	soundWizard/soundpage5.ui \
123	>	soundWizard/soundpagefinal.ui \
124	>	bgImageWizard/bgimagepage2.ui \
125	>	bgImageWizard/bgimagepage3.ui \
126	>	bgImageWizard/bgimagepagefinal.ui \
127	>	xmlToolsInterface/xmltoolsinterface.ui \
128	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.ui
129
130		RESOURCES += \
131		resources.qrc \

Diff Legend

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