# HG changeset patch
# User Chris Cannam
# Date 1477389915 -3600
# Node ID d5e339613174be7acfe20906a347b35c396883b4
# Parent  066d8c5f3b2127d6b97434d3d5e03a495abdcaa4# Parent  7a3fa603190e50a8da656cfa1aeb109375085548
Merge from branch 3.0-integration

diff -r 7a3fa603190e -r d5e339613174 files.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/files.pri	Tue Oct 25 11:05:15 2016 +0100
@@ -0,0 +1,28 @@
+
+SVAPP_HEADERS += \
+           audio/AudioCallbackPlaySource.h \
+           audio/AudioRecordTarget.h \
+           audio/AudioGenerator.h \
+           audio/ClipMixer.h \
+           audio/ContinuousSynth.h \
+           audio/PlaySpeedRangeMapper.h \
+           framework/Align.h \
+	   framework/Document.h \
+           framework/MainWindowBase.h \
+           framework/SVFileReader.h \
+           framework/TransformUserConfigurator.h \
+           framework/VersionTester.h
+
+SVAPP_SOURCES += \
+           audio/AudioCallbackPlaySource.cpp \
+           audio/AudioRecordTarget.cpp \
+           audio/AudioGenerator.cpp \
+           audio/ClipMixer.cpp \
+           audio/ContinuousSynth.cpp \
+           audio/PlaySpeedRangeMapper.cpp \
+	   framework/Align.cpp \
+	   framework/Document.cpp \
+           framework/MainWindowBase.cpp \
+           framework/SVFileReader.cpp \
+           framework/TransformUserConfigurator.cpp \
+           framework/VersionTester.cpp
diff -r 7a3fa603190e -r d5e339613174 svapp.pro
--- a/svapp.pro	Fri Oct 21 11:49:27 2016 +0100
+++ b/svapp.pro	Tue Oct 25 11:05:15 2016 +0100
@@ -2,43 +2,10 @@
 TEMPLATE = lib
 
 INCLUDEPATH += ../vamp-plugin-sdk
-DEFINES += HAVE_VAMP HAVE_VAMPHOSTSDK
 
 exists(config.pri) {
     include(config.pri)
 }
-!exists(config.pri) {
-
-    CONFIG += release
-    DEFINES += NDEBUG BUILD_RELEASE
-    DEFINES += NO_TIMING
-
-    win32-g++ {
-        INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
-        LIBS += -L../sv-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
-        LIBS += -L../sv-dependency-builds/win64-msvc/lib
-    }
-    macx* {
-        INCLUDEPATH += ../sv-dependency-builds/osx/include
-        LIBS += -L../sv-dependency-builds/osx/lib
-    }
-
-    win* {
-        DEFINES += HAVE_PORTAUDIO
-    }
-    macx* {
-        DEFINES += HAVE_COREAUDIO HAVE_PORTAUDIO
-    }
-    win32-msvc* {
-        DEFINES += NOMINMAX _USE_MATH_DEFINES
-        DEFINES -= HAVE_LIBLO
-    }
-}
 
 CONFIG += staticlib qt thread warn_on stl rtti exceptions c++11
 QT += network xml gui widgets
@@ -50,31 +17,8 @@
 OBJECTS_DIR = o
 MOC_DIR = o
 
-HEADERS += audio/AudioCallbackPlaySource.h \
-           audio/AudioRecordTarget.h \
-           audio/AudioGenerator.h \
-           audio/ClipMixer.h \
-           audio/ContinuousSynth.h \
-           audio/PlaySpeedRangeMapper.h
+include(files.pri)
 
-SOURCES += audio/AudioCallbackPlaySource.cpp \
-           audio/AudioRecordTarget.cpp \
-           audio/AudioGenerator.cpp \
-           audio/ClipMixer.cpp \
-           audio/ContinuousSynth.cpp \
-           audio/PlaySpeedRangeMapper.cpp
+HEADERS = $$(SVAPP_HEADERS)
+SOURCES = $$(SVAPP_SOURCES)
 
-HEADERS += framework/Align.h \
-	   framework/Document.h \
-           framework/MainWindowBase.h \
-           framework/SVFileReader.h \
-           framework/TransformUserConfigurator.h \
-           framework/VersionTester.h
-
-SOURCES += framework/Align.cpp \
-	   framework/Document.cpp \
-           framework/MainWindowBase.cpp \
-           framework/SVFileReader.cpp \
-           framework/TransformUserConfigurator.cpp \
-           framework/VersionTester.cpp
-