--- Vago/trunk/Vago/Vago.pro	2016/12/09 19:04:18	1061
+++ s10k/Vago/Vago.pro	2017/12/30 13:57:32	1093
@@ -11,6 +11,7 @@ win32 {
 QT       += winextras
 }
 CONFIG   += c++14
+CONFIG   += quazip
 
 INCLUDEPATH += ./packageWizard
 INCLUDEPATH += ./soundWizard
@@ -19,17 +20,11 @@ INCLUDEPATH += ./bgImageWizard
 INCLUDEPATH += ./xmlToolsInterface
 INCLUDEPATH += ./windowMessagesWizard
 
+include(../CommonUtils/CommonUtils.pri)
+include(../CommonLibs/CommonLibs.pri)
+
 # 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!)
@@ -38,7 +33,6 @@ ICON = vago_icon.icns # mac os icon
 
 INCLUDEPATH += ./libs/DropTableWidget
 INCLUDEPATH += ./libs/DropLineEdit
-INCLUDEPATH += ../Libs/pugixml
 
 win32 {
 RC_FILE = icon_resource.rc #for windows explorer icon
@@ -48,12 +42,10 @@ TARGET = Vago
 TEMPLATE = app
 
 SOURCES += \
-    util.cpp \
     preferences.cpp \
     manualcommands.cpp \
     mainwindow.cpp \
     main.cpp \
-    logger.cpp \
     converter.cpp \
     about.cpp \
     packageWizard/packagewizard.cpp \
@@ -74,9 +66,7 @@ SOURCES += \
     bgImageWizard/bgimagepage3.cpp \
     bgImageWizard/bgimagepagefinal.cpp \
     xmlToolsInterface/xmltoolsinterface.cpp \
-    libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
     xmlToolsInterface/xmltoolsinterfacecommandpreview.cpp \
-    libs/LineNumberDisplay/LineNumberDisplay.cpp \
     abstractwizard.cpp \
     windowMessagesWizard/wmsetuppage.cpp \
     windowMessagesWizard/wmformatpage.cpp \
@@ -85,14 +75,12 @@ SOURCES += \
     windowMessagesWizard/wmfinalpage.cpp \
     ./libs/DropTableWidget/droptablewidget.cpp \
     ./libs/DropLineEdit/droplineedit.cpp \
-    ../Libs/pugixml/pugixml.cpp
+    xmlParsers/projectfilevago.cpp
 
 HEADERS  += \
-    util.h \
     preferences.h \
     manualcommands.h \
     mainwindow.h \
-    logger.h \
     converter.h \
     about.h \
     packageWizard/packagewizard.h \
@@ -113,9 +101,7 @@ HEADERS  += \
     bgImageWizard/bgimagepage3.h \
     bgImageWizard/bgimagepagefinal.h \
     xmlToolsInterface/xmltoolsinterface.h \
-    libs/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
     xmlToolsInterface/xmltoolsinterfacecommandpreview.h \
-    libs/LineNumberDisplay/LineNumberDisplay.h \
     wizardfactory.h \
     abstractwizard.h \
     windowMessagesWizard/wmsetuppage.h \
@@ -125,7 +111,7 @@ HEADERS  += \
     windowMessagesWizard/wmfinalpage.h \
     ./libs/DropTableWidget/droptablewidget.h \
     ./libs/DropLineEdit/droplineedit.h \
-    ../Libs/pugixml/pugixml.hpp
+    xmlParsers/projectfilevago.h
 
 FORMS    += \
     mainwindow.ui \