diff tonyapp.pro @ 521:25aa28a27252

Update SV code following SV 3.0.x release series
author Chris Cannam
date Wed, 15 Mar 2017 11:31:49 +0000
parents 30fbc53d8150
children f52766aa747b
line wrap: on
line diff
--- a/tonyapp.pro	Fri Aug 19 15:58:57 2016 +0100
+++ b/tonyapp.pro	Wed Mar 15 11:31:49 2017 +0000
@@ -6,93 +6,35 @@
 }
 
 !exists(config.pri) {
-
-    CONFIG += release
-    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
-
-    win32-g++ {
-        INCLUDEPATH += sv-dependency-builds/win32-mingw/include
-        LIBS += -Lsv-dependency-builds/win32-mingw/lib
-    }
-    win32-msvc* {
-        INCLUDEPATH += sv-dependency-builds/win32-msvc/include
-        LIBS += -Lsv-dependency-builds/win32-msvc/lib
-    }
-    macx* {
-        INCLUDEPATH += sv-dependency-builds/osx/include
-        LIBS += -Lsv-dependency-builds/osx/lib
-    }
-
-    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_LIBLO HAVE_MAD HAVE_ID3TAG
-
-    LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lsamplerate -llo -lz -lsord-0 -lserd-0
-
-    win* {
-        DEFINES += HAVE_PORTAUDIO_2_0
-        LIBS += -lportaudio -lwinmm -lws2_32
-    }
-    macx* {
-        DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO_2_0
-        LIBS += -lportaudio -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
-    }
+    include(noconfig.pri)
 }
 
-CONFIG += qt thread warn_on stl rtti exceptions c++11
+include(base.pri)
+
 QT += network xml gui widgets svg
 
 TARGET = Tony
 linux*:TARGET = tony
 solaris*:TARGET = tony
 
-DEPENDPATH += . bqaudioio svcore svgui svapp
-INCLUDEPATH += . bqaudioio svcore svgui svapp
-
 OBJECTS_DIR = o
 MOC_DIR = o
 
 ICON = tony.icns
 RC_FILE = icons/tony.rc
 
-contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
+RESOURCES += tony.qrc
 
-MY_LIBS = -Lsvapp -Lsvgui -Lsvcore -Lchecker -Ldataquay -L. \
-          -lsvapp -lsvgui -lsvcore -lchecker -ldataquay -lbq
+QMAKE_INFO_PLIST = deploy/osx/Info.plist
 
-linux* {
-MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
-}
+include(svgui/files.pri)
+include(svapp/files.pri)
 
-win* {
-MY_LIBS = -Lsvapp/release -Lsvgui/release -Lsvcore/release -Lchecker/release -Ldataquay/release -Lrelease $$MY_LIBS
-}
+for (file, SVGUI_SOURCES)    { SOURCES += $$sprintf("svgui/%1",    $$file) }
+for (file, SVAPP_SOURCES)    { SOURCES += $$sprintf("svapp/%1",    $$file) }
 
-LIBS = $$MY_LIBS $$LIBS
-
-win32-msvc* {
-PRE_TARGETDEPS += svapp/svapp.lib \
-                  svgui/svgui.lib \
-                  svcore/svcore.lib \
-                  dataquay/dataquay.lib \
-                  checker/checker.lib
-}
-
-win32-g++ {
-PRE_TARGETDEPS += svapp/release/libsvapp.a \
-                  svgui/release/libsvgui.a \
-                  svcore/release/libsvcore.a \
-                  dataquay/release/libdataquay.a \
-                  checker/release/libchecker.a
-}
-
-!win* {
-PRE_TARGETDEPS += svapp/libsvapp.a \
-                  svgui/libsvgui.a \
-                  svcore/libsvcore.a \
-                  dataquay/libdataquay.a \
-                  checker/libchecker.a
-}
-
-RESOURCES += tony.qrc
+for (file, SVGUI_HEADERS)    { HEADERS += $$sprintf("svgui/%1",    $$file) }
+for (file, SVAPP_HEADERS)    { HEADERS += $$sprintf("svapp/%1",    $$file) }
 
 HEADERS += src/MainWindow.h \
            src/NetworkPermissionTester.h \
@@ -103,7 +45,5 @@
            src/NetworkPermissionTester.cpp \
            src/MainWindow.cpp
 
-QMAKE_INFO_PLIST = deploy/osx/Info.plist
 
 
-