diff server.pro @ 1279:c6513cae4747 project-file-rework

Cut down vastly on the number of config.pri files and places where their contents has to be effectively duplicated without them
author Chris Cannam
date Mon, 24 Oct 2016 17:53:33 +0100
parents eb60f984c66c
children ac6db2ee1beb
line wrap: on
line diff
--- a/server.pro	Mon Oct 24 10:52:51 2016 +0100
+++ b/server.pro	Mon Oct 24 17:53:33 2016 +0100
@@ -8,37 +8,15 @@
     include(config.pri)
 }
 
-win32-g++ {
-    INCLUDEPATH += sv-dependency-builds/win32-mingw/include
-    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib
-}
-win32-msvc* {
-    # We actually expect MSVC to be used only for 64-bit builds,
-    # though the qmake spec is still called win32-msvc*
-    INCLUDEPATH += sv-dependency-builds/win64-msvc/include
-# bah, this is happening even if not debug build
-    CONFIG(debug) {
-        LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \
-            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \
-            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
-    }
-#    CONFIG(release) {
-#        LIBS += -Lrelease \
-#            -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib
-#    }
-}
-mac* {
-    INCLUDEPATH += sv-dependency-builds/osx/include
-    LIBS += -Lsv-dependency-builds/osx/lib
+!exists(config.pri) {
+    include(noconfig.pri)
 }
 
 # Using the "console" CONFIG flag above should ensure this happens for
 # normal Windows builds, but this may be necessary when cross-compiling
 win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
 
-!win32 {
-    QMAKE_CXXFLAGS += -Werror
-}
+linux*: LIBS += -ldl
 
 TARGET = piper-vamp-server
 
@@ -46,7 +24,11 @@
 MOC_DIR = o
 
 INCLUDEPATH += piper-cpp vamp-plugin-sdk
-LIBS += -lcapnp -lkj
+
+include(vamp-plugin-sdk-files.pri)
+
+for (file, VAMP_SOURCES)     { SOURCES += $$file }
+for (file, VAMP_HEADERS)     { HEADERS += $$file }
 
 HEADERS += \
         piper-cpp/vamp-capnp/piper.capnp.h \
@@ -55,14 +37,3 @@
 SOURCES += \
         piper-cpp/vamp-capnp/piper-capnp.cpp \
         piper-cpp/vamp-server/server.cpp
-
-SOURCES +=  \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginBufferingAdapter.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginChannelAdapter.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginHostAdapter.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginInputDomainAdapter.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginLoader.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/PluginWrapper.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp \
-        vamp-plugin-sdk/src/vamp-hostsdk/Files.cpp