--- Vago/trunk/Vago/Vago.pro 2014/04/25 21:05:54 998 +++ Vago/trunk/Vago/Vago.pro 2016/10/12 21:35:13 1054 @@ -4,15 +4,30 @@ # #------------------------------------------------- -QT += core gui +QT += widgets QT += network #network communication QT += script #for json parse -QT += widgets +win32 { +QT += winextras +} +CONFIG += c++14 -INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib -INCLUDEPATH += ./libs +#INCLUDEPATH += ./libs INCLUDEPATH += ./packageWizard INCLUDEPATH += ./soundWizard +INCLUDEPATH += ./bgImageWizard + +# 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!) @@ -36,9 +51,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 \ @@ -47,9 +59,16 @@ 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 \ HEADERS += \ util.h \ @@ -60,12 +79,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 \ @@ -74,11 +87,19 @@ 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 -FORMS += mainwindow.ui \ +FORMS += \ + mainwindow.ui \ preferences.ui \ manualcommands.ui \ about.ui \ @@ -89,7 +110,11 @@ 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 \ RESOURCES += \ resources.qrc \