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 1047 by s10k, Fri Sep 16 22:51:26 2016 UTC vs.
s10k/Vago/Vago.pro (file contents), Revision 1092 by s10k, Sat Dec 30 13:43:28 2017 UTC

#	Line 12 | Line 12 | QT       += winextras
12		}
13		CONFIG   += c++14
14
15	–	#INCLUDEPATH += ./libs
15		INCLUDEPATH += ./packageWizard
16		INCLUDEPATH += ./soundWizard
17	+	INCLUDEPATH += ./bgImageWizard
18	+	INCLUDEPATH += ./bgImageWizard
19	+	INCLUDEPATH += ./xmlToolsInterface
20	+	INCLUDEPATH += ./windowMessagesWizard
21
22		# Used this great tutorial to build zlib and quazip:
23		# http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
24		INCLUDEPATH += ../Libs/zlib-1.2.8
25	<	LIBS += -LC:../Libs/zlib-1.2.8 -lz
25	>	LIBS += -L../Libs/zlib-1.2.8 -lz
26		INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
27	+	win32 {
28		LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
29	+	}
30	+	macx {
31	+	LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
32	+	}
33
34		macx {
35		LIBS += -lz # for mac support zipping (thanks edt!)
36		ICON = vago_icon.icns # mac os icon
37		}
38
39	+	INCLUDEPATH += ./libs/DropTableWidget
40	+	INCLUDEPATH += ./libs/DropLineEdit
41	+	INCLUDEPATH += ../Libs/pugixml
42	+
43		win32 {
44		RC_FILE = icon_resource.rc #for windows explorer icon
45		}
#	Line 42 | Line 54 | SOURCES += \
54		mainwindow.cpp \
55		main.cpp \
56		logger.cpp \
45	–	droptablewidget.cpp \
57		converter.cpp \
58		about.cpp \
59		packageWizard/packagewizard.cpp \
#	Line 53 | Line 64 | SOURCES += \
64		soundWizard/soundpage2.cpp \
65		soundWizard/soundpage3.cpp \
66		soundWizard/soundpage4.cpp \
67	+	soundWizard/soundpage5.cpp \
68		soundWizard/soundpagefinal.cpp \
69		soundWizard/soundwizard.cpp \
70	+	bgImageWizard/bgimagepage2.cpp \
71		xmlprocessor.cpp \
72	<	libs/pugixml/pugixml.cpp \
73	<	utilvago.cpp
72	>	utilvago.cpp \
73	>	bgImageWizard/bgimagewizard.cpp \
74	>	bgImageWizard/bgimagepage3.cpp \
75	>	bgImageWizard/bgimagepagefinal.cpp \
76	>	xmlToolsInterface/xmltoolsinterface.cpp \
77	>	libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
78	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
79	>	libs/LineNumberDisplay/LineNumberDisplay.cpp \
80	>	abstractwizard.cpp \
81	>	windowMessagesWizard/wmsetuppage.cpp \
82	>	windowMessagesWizard/wmformatpage.cpp \
83	>	windowMessagesWizard/wmpage.cpp \
84	>	windowMessagesWizard/wmwizard.cpp \
85	>	windowMessagesWizard/wmfinalpage.cpp \
86	>	./libs/DropTableWidget/droptablewidget.cpp \
87	>	./libs/DropLineEdit/droplineedit.cpp \
88	>	../Libs/pugixml/pugixml.cpp
89
90		HEADERS  += \
91		util.h \
#	Line 65 | Line 93 | HEADERS  += \
93		manualcommands.h \
94		mainwindow.h \
95		logger.h \
68	–	droptablewidget.h \
96		converter.h \
97		about.h \
98		packageWizard/packagewizard.h \
#	Line 76 | Line 103 | HEADERS  += \
103		soundWizard/soundpage2.h \
104		soundWizard/soundpage3.h \
105		soundWizard/soundpage4.h \
106	+	soundWizard/soundpage5.h \
107		soundWizard/soundpagefinal.h \
108		soundWizard/soundwizard.h \
109	+	bgImageWizard/bgimagepage2.h \
110		xmlprocessor.h \
111	<	libs/pugixml/pugixml.hpp \
112	<	utilvago.h
111	>	utilvago.h \
112	>	bgImageWizard/bgimagewizard.h \
113	>	bgImageWizard/bgimagepage3.h \
114	>	bgImageWizard/bgimagepagefinal.h \
115	>	xmlToolsInterface/xmltoolsinterface.h \
116	>	libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
117	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
118	>	libs/LineNumberDisplay/LineNumberDisplay.h \
119	>	wizardfactory.h \
120	>	abstractwizard.h \
121	>	windowMessagesWizard/wmsetuppage.h \
122	>	windowMessagesWizard/wmformatpage.h \
123	>	windowMessagesWizard/wmpage.h \
124	>	windowMessagesWizard/wmwizard.h \
125	>	windowMessagesWizard/wmfinalpage.h \
126	>	./libs/DropTableWidget/droptablewidget.h \
127	>	./libs/DropLineEdit/droplineedit.h \
128	>	../Libs/pugixml/pugixml.hpp
129
130		FORMS    += \
131		mainwindow.ui \
#	Line 94 | Line 139 | FORMS    += \
139		soundWizard/soundpage2.ui \
140		soundWizard/soundpage3.ui \
141		soundWizard/soundpage4.ui \
142	<	soundWizard/soundpagefinal.ui
142	>	soundWizard/soundpage5.ui \
143	>	soundWizard/soundpagefinal.ui \
144	>	bgImageWizard/bgimagepage2.ui \
145	>	bgImageWizard/bgimagepage3.ui \
146	>	bgImageWizard/bgimagepagefinal.ui \
147	>	xmlToolsInterface/xmltoolsinterface.ui \
148	>	xmlToolsInterface/xmltoolsinterfacecommandpreview.ui \
149	>	windowMessagesWizard/wmsetuppage.ui \
150	>	windowMessagesWizard/wmformatpage.ui \
151	>	windowMessagesWizard/wmfinalpage.ui
152
153		RESOURCES += \
154		resources.qrc \

Diff Legend

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