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 1052 by s10k, Sat Sep 17 13:32:34 2016 UTC vs.
s10k/Vago/Vago.pro (file contents), Revision 1093 by s10k, Sat Dec 30 13:57:32 2017 UTC

#	Line 11 | Line 11 | win32 {
11		QT       += winextras
12		}
13		CONFIG   += c++14
14	+	CONFIG   += quazip
15
15	–	#INCLUDEPATH += ./libs
16		INCLUDEPATH += ./packageWizard
17		INCLUDEPATH += ./soundWizard
18	+	INCLUDEPATH += ./bgImageWizard
19	+	INCLUDEPATH += ./bgImageWizard
20	+	INCLUDEPATH += ./xmlToolsInterface
21	+	INCLUDEPATH += ./windowMessagesWizard
22	+
23	+	include(../CommonUtils/CommonUtils.pri)
24	+	include(../CommonLibs/CommonLibs.pri)
25
26		# Used this great tutorial to build zlib and quazip:
27		# http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
21	–	INCLUDEPATH += ../Libs/zlib-1.2.8
22	–	LIBS += -L../Libs/zlib-1.2.8 -lz
23	–	INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
24	–	win32 {
25	–	LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
26	–	}
27	–	macx {
28	–	LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
29	–	}
28
29		macx {
30		LIBS += -lz # for mac support zipping (thanks edt!)
31		ICON = vago_icon.icns # mac os icon
32		}
33
34	+	INCLUDEPATH += ./libs/DropTableWidget
35	+	INCLUDEPATH += ./libs/DropLineEdit
36	+
37		win32 {
38		RC_FILE = icon_resource.rc #for windows explorer icon
39		}
#	Line 41 | Line 42 | TARGET = Vago
42		TEMPLATE = app
43
44		SOURCES += \
44	–	util.cpp \
45		preferences.cpp \
46		manualcommands.cpp \
47		mainwindow.cpp \
48		main.cpp \
49	–	logger.cpp \
50	–	droptablewidget.cpp \
49		converter.cpp \
50		about.cpp \
51		packageWizard/packagewizard.cpp \
#	Line 58 | Line 56 | SOURCES += \
56		soundWizard/soundpage2.cpp \
57		soundWizard/soundpage3.cpp \
58		soundWizard/soundpage4.cpp \
59	+	soundWizard/soundpage5.cpp \
60		soundWizard/soundpagefinal.cpp \
61		soundWizard/soundwizard.cpp \
62	+	bgImageWizard/bgimagepage2.cpp \
63		xmlprocessor.cpp \
64	<	libs/pugixml/pugixml.cpp \
65	<	utilvago.cpp
64	>	utilvago.cpp \
65	>	bgImageWizard/bgimagewizard.cpp \
66	>	bgImageWizard/bgimagepage3.cpp \
67	>	bgImageWizard/bgimagepagefinal.cpp \
68	>	xmlToolsInterface/xmltoolsinterface.cpp \
69	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
70	>	abstractwizard.cpp \
71	>	windowMessagesWizard/wmsetuppage.cpp \
72	>	windowMessagesWizard/wmformatpage.cpp \
73	>	windowMessagesWizard/wmpage.cpp \
74	>	windowMessagesWizard/wmwizard.cpp \
75	>	windowMessagesWizard/wmfinalpage.cpp \
76	>	./libs/DropTableWidget/droptablewidget.cpp \
77	>	./libs/DropLineEdit/droplineedit.cpp \
78	>	xmlParsers/projectfilevago.cpp
79
80		HEADERS  += \
68	–	util.h \
81		preferences.h \
82		manualcommands.h \
83		mainwindow.h \
72	–	logger.h \
73	–	droptablewidget.h \
84		converter.h \
85		about.h \
86		packageWizard/packagewizard.h \
#	Line 81 | Line 91 | HEADERS  += \
91		soundWizard/soundpage2.h \
92		soundWizard/soundpage3.h \
93		soundWizard/soundpage4.h \
94	+	soundWizard/soundpage5.h \
95		soundWizard/soundpagefinal.h \
96		soundWizard/soundwizard.h \
97	+	bgImageWizard/bgimagepage2.h \
98		xmlprocessor.h \
99	<	libs/pugixml/pugixml.hpp \
100	<	utilvago.h
99	>	utilvago.h \
100	>	bgImageWizard/bgimagewizard.h \
101	>	bgImageWizard/bgimagepage3.h \
102	>	bgImageWizard/bgimagepagefinal.h \
103	>	xmlToolsInterface/xmltoolsinterface.h \
104	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
105	>	wizardfactory.h \
106	>	abstractwizard.h \
107	>	windowMessagesWizard/wmsetuppage.h \
108	>	windowMessagesWizard/wmformatpage.h \
109	>	windowMessagesWizard/wmpage.h \
110	>	windowMessagesWizard/wmwizard.h \
111	>	windowMessagesWizard/wmfinalpage.h \
112	>	./libs/DropTableWidget/droptablewidget.h \
113	>	./libs/DropLineEdit/droplineedit.h \
114	>	xmlParsers/projectfilevago.h
115
116		FORMS    += \
117		mainwindow.ui \
#	Line 99 | Line 125 | FORMS    += \
125		soundWizard/soundpage2.ui \
126		soundWizard/soundpage3.ui \
127		soundWizard/soundpage4.ui \
128	<	soundWizard/soundpagefinal.ui
128	>	soundWizard/soundpage5.ui \
129	>	soundWizard/soundpagefinal.ui \
130	>	bgImageWizard/bgimagepage2.ui \
131	>	bgImageWizard/bgimagepage3.ui \
132	>	bgImageWizard/bgimagepagefinal.ui \
133	>	xmlToolsInterface/xmltoolsinterface.ui \
134	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.ui \
135	>	windowMessagesWizard/wmsetuppage.ui \
136	>	windowMessagesWizard/wmformatpage.ui \
137	>	windowMessagesWizard/wmfinalpage.ui
138
139		RESOURCES += \
140		resources.qrc \

Diff Legend

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