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 790 by s10k, Sat Apr 6 20:54:26 2013 UTC vs.
Revision 1054 by s10k, Wed Oct 12 21:35:13 2016 UTC

#	Line 4 | Line 4
4		#
5		#-------------------------------------------------
6
7	<	QT       += core gui
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 += ./libs
15	>	#INCLUDEPATH += ./libs
16		INCLUDEPATH += ./packageWizard
17		INCLUDEPATH += ./soundWizard
18	+	INCLUDEPATH += ./bgImageWizard
19	+
20	+	# Used this great tutorial to build zlib and quazip:
21	+	# http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
22	+	INCLUDEPATH += ../Libs/zlib-1.2.8
23	+	LIBS += -L../Libs/zlib-1.2.8 -lz
24	+	INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
25	+	win32 {
26	+	LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
27	+	}
28	+	macx {
29	+	LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
30	+	}
31
32		macx {
33		LIBS += -lz # for mac support zipping (thanks edt!)
#	Line 34 | Line 51 | SOURCES += \
51		droptablewidget.cpp \
52		converter.cpp \
53		about.cpp \
37	–	libs/zipglobal.cpp \
38	–	libs/zip.cpp \
39	–	libs/unzip.cpp \
54		packageWizard/packagewizard.cpp \
55		packageWizard/packagepagefinal.cpp \
56		packageWizard/packagepage4.cpp \
#	Line 45 | Line 59 | SOURCES += \
59		soundWizard/soundpage2.cpp \
60		soundWizard/soundpage3.cpp \
61		soundWizard/soundpage4.cpp \
62	+	soundWizard/soundpage5.cpp \
63		soundWizard/soundpagefinal.cpp \
64		soundWizard/soundwizard.cpp \
65	<	xmlprocessor.cpp
65	>	bgImageWizard/bgimagepage2.cpp \
66	>	xmlprocessor.cpp \
67	>	libs/pugixml/pugixml.cpp \
68	>	utilvago.cpp \
69	>	bgImageWizard/bgimagewizard.cpp \
70	>	bgImageWizard/bgimagepage3.cpp \
71	>	bgImageWizard/bgimagepagefinal.cpp \
72
73		HEADERS  += \
74		util.h \
#	Line 58 | Line 79 | HEADERS  += \
79		droptablewidget.h \
80		converter.h \
81		about.h \
61	–	libs/zipglobal.h \
62	–	libs/zipentry_p.h \
63	–	libs/zip_p.h \
64	–	libs/zip.h \
65	–	libs/unzip_p.h \
66	–	libs/unzip.h \
82		packageWizard/packagewizard.h \
83		packageWizard/packagepagefinal.h \
84		packageWizard/packagepage4.h \
#	Line 72 | Line 87 | HEADERS  += \
87		soundWizard/soundpage2.h \
88		soundWizard/soundpage3.h \
89		soundWizard/soundpage4.h \
90	+	soundWizard/soundpage5.h \
91		soundWizard/soundpagefinal.h \
92		soundWizard/soundwizard.h \
93	<	xmlprocessor.h
93	>	bgImageWizard/bgimagepage2.h \
94	>	xmlprocessor.h \
95	>	libs/pugixml/pugixml.hpp \
96	>	utilvago.h \
97	>	bgImageWizard/bgimagewizard.h \
98	>	bgImageWizard/bgimagepage3.h \
99	>	bgImageWizard/bgimagepagefinal.h
100
101	<	FORMS    += mainwindow.ui \
101	>	FORMS    += \
102	>	mainwindow.ui \
103		preferences.ui \
104		manualcommands.ui \
105		about.ui \
#	Line 87 | Line 110 | FORMS    += mainwindow.ui \
110		soundWizard/soundpage2.ui \
111		soundWizard/soundpage3.ui \
112		soundWizard/soundpage4.ui \
113	<	soundWizard/soundpagefinal.ui
113	>	soundWizard/soundpage5.ui \
114	>	soundWizard/soundpagefinal.ui \
115	>	bgImageWizard/bgimagepage2.ui \
116	>	bgImageWizard/bgimagepage3.ui \
117	>	bgImageWizard/bgimagepagefinal.ui \
118
119		RESOURCES += \
120		resources.qrc \

Diff Legend

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