--- Vago/trunk/Vago/Vago.pro 2014/04/26 12:40:47 999 +++ Vago/trunk/Vago/Vago.pro 2016/09/17 13:32:34 1052 @@ -7,12 +7,27 @@ QT += widgets QT += network #network communication QT += script #for json parse +win32 { +QT += winextras +} +CONFIG += c++14 -INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib -INCLUDEPATH += ./libs +#INCLUDEPATH += ./libs INCLUDEPATH += ./packageWizard INCLUDEPATH += ./soundWizard +# 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 @@ -35,9 +50,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 \ @@ -48,7 +60,9 @@ SOURCES += \ soundWizard/soundpage4.cpp \ soundWizard/soundpagefinal.cpp \ soundWizard/soundwizard.cpp \ - xmlprocessor.cpp + xmlprocessor.cpp \ + libs/pugixml/pugixml.cpp \ + utilvago.cpp HEADERS += \ util.h \ @@ -59,12 +73,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 \ @@ -75,9 +83,12 @@ HEADERS += \ soundWizard/soundpage4.h \ soundWizard/soundpagefinal.h \ soundWizard/soundwizard.h \ - xmlprocessor.h + xmlprocessor.h \ + libs/pugixml/pugixml.hpp \ + utilvago.h -FORMS += mainwindow.ui \ +FORMS += \ + mainwindow.ui \ preferences.ui \ manualcommands.ui \ about.ui \