--- Vago/trunk/Vago/Vago.pro	2013/03/31 19:02:16	771
+++ Vago/trunk/Vago/Vago.pro	2016/10/30 14:42:39	1058
@@ -4,17 +4,43 @@
 #
 #-------------------------------------------------
 
-QT       += core gui
+QT       += widgets
 QT       += network #network communication
 QT       += script #for json parse
+win32 {
+QT       += winextras
+}
+CONFIG   += c++14
 
-INCLUDEPATH += ./libs
+#INCLUDEPATH += ./libs
 INCLUDEPATH += ./packageWizard
 INCLUDEPATH += ./soundWizard
+INCLUDEPATH += ./bgImageWizard
+INCLUDEPATH += ./xmlToolsInterface
+
+# Used this great tutorial to build zlib and quazip:
+# http://www.antonioborondo.com/2014/10/22/zipping-and-unzipping-files-with-qt/
+INCLUDEPATH += ../Libs/zlib-1.2.8
+LIBS += -L../Libs/zlib-1.2.8 -lz
+INCLUDEPATH += ../Libs/quazip-0.7.2/quazip
+win32 {
+LIBS += -L../Libs/quazip-0.7.2/quazip/release -lquazip
+}
+macx {
+LIBS += -L../Libs/quazip-0.7.2/quazip -lquazip
+}
+
+macx {
+LIBS += -lz # for mac support zipping (thanks edt!)
+ICON = vago_icon.icns # mac os icon
+}
+
+win32 {
+RC_FILE = icon_resource.rc #for windows explorer icon
+}
 
 TARGET = Vago
 TEMPLATE = app
-RC_FILE = icon_resource.rc #for windows explorer icon
 
 SOURCES += \
     util.cpp \
@@ -26,9 +52,6 @@ SOURCES += \
     droptablewidget.cpp \
     converter.cpp \
     about.cpp \
-    libs/zipglobal.cpp \
-    libs/zip.cpp \
-    libs/unzip.cpp \
     packageWizard/packagewizard.cpp \
     packageWizard/packagepagefinal.cpp \
     packageWizard/packagepage4.cpp \
@@ -37,9 +60,20 @@ SOURCES += \
     soundWizard/soundpage2.cpp \
     soundWizard/soundpage3.cpp \
     soundWizard/soundpage4.cpp \
+    soundWizard/soundpage5.cpp \
     soundWizard/soundpagefinal.cpp \
     soundWizard/soundwizard.cpp \
-    xmlprocessor.cpp
+    bgImageWizard/bgimagepage2.cpp \
+    xmlprocessor.cpp \
+    libs/pugixml/pugixml.cpp \
+    utilvago.cpp \
+    bgImageWizard/bgimagewizard.cpp \
+    bgImageWizard/bgimagepage3.cpp \
+    bgImageWizard/bgimagepagefinal.cpp \
+    xmlToolsInterface/xmltoolsinterface.cpp \
+    libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
+    libs/LineNumberDisplay/LineNumberDisplay.cpp
 
 HEADERS  += \
     util.h \
@@ -50,12 +84,6 @@ HEADERS  += \
     droptablewidget.h \
     converter.h \
     about.h \
-    libs/zipglobal.h \
-    libs/zipentry_p.h \
-    libs/zip_p.h \
-    libs/zip.h \
-    libs/unzip_p.h \
-    libs/unzip.h \
     packageWizard/packagewizard.h \
     packageWizard/packagepagefinal.h \
     packageWizard/packagepage4.h \
@@ -64,11 +92,23 @@ HEADERS  += \
     soundWizard/soundpage2.h \
     soundWizard/soundpage3.h \
     soundWizard/soundpage4.h \
+    soundWizard/soundpage5.h \
     soundWizard/soundpagefinal.h \
     soundWizard/soundwizard.h \
-    xmlprocessor.h
+    bgImageWizard/bgimagepage2.h \
+    xmlprocessor.h \
+    libs/pugixml/pugixml.hpp \
+    utilvago.h \
+    bgImageWizard/bgimagewizard.h \
+    bgImageWizard/bgimagepage3.h \
+    bgImageWizard/bgimagepagefinal.h \
+    xmlToolsInterface/xmltoolsinterface.h \
+    libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
+    libs/LineNumberDisplay/LineNumberDisplay.h
 
-FORMS    += mainwindow.ui \
+FORMS    += \
+    mainwindow.ui \
     preferences.ui \
     manualcommands.ui \
     about.ui \
@@ -79,7 +119,13 @@ FORMS    += mainwindow.ui \
     soundWizard/soundpage2.ui \
     soundWizard/soundpage3.ui \
     soundWizard/soundpage4.ui \
-    soundWizard/soundpagefinal.ui
+    soundWizard/soundpage5.ui \
+    soundWizard/soundpagefinal.ui \
+    bgImageWizard/bgimagepage2.ui \
+    bgImageWizard/bgimagepage3.ui \
+    bgImageWizard/bgimagepagefinal.ui \
+    xmlToolsInterface/xmltoolsinterface.ui \
+    xmlToolsInterface/xmltoolsinterfacecommandpreview.ui
 
 RESOURCES += \
     resources.qrc \