changeset 260:382f33b7f00e piper-nopiper

Subrepo updates, and update the build scripts accordingly
author Chris Cannam
date Mon, 21 Nov 2016 17:08:34 +0000
parents 857ce6ecb163
children af8f6370c7a9
files .hgsub .hgsubstate base.pri bq-files.pri configure configure.ac noconfig.pri runner.pro sonic-annotator.pro test-svcore-base.pro test-svcore-data-fileio.pro vamp-plugin-sdk-files.pri
diffstat 12 files changed, 289 insertions(+), 253 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsub	Fri Nov 04 14:16:01 2016 +0000
+++ b/.hgsub	Mon Nov 21 17:08:34 2016 +0000
@@ -1,5 +1,7 @@
 vamp-plugin-sdk = https://code.soundsoftware.ac.uk/hg/vamp-plugin-sdk
+bqvec = https://bitbucket.org/breakfastquay/bqvec
+bqfft = https://bitbucket.org/breakfastquay/bqfft
+dataquay = https://bitbucket.org/breakfastquay/dataquay
 svcore = https://code.soundsoftware.ac.uk/hg/svcore
-dataquay = https://bitbucket.org/breakfastquay/dataquay
 sv-dependency-builds = https://code.soundsoftware.ac.uk/hg/sv-dependency-builds
 piper-cpp = https://code.soundsoftware.ac.uk/hg/piper-cpp
--- a/.hgsubstate	Fri Nov 04 14:16:01 2016 +0000
+++ b/.hgsubstate	Mon Nov 21 17:08:34 2016 +0000
@@ -1,5 +1,7 @@
+44865d17ef69a891af778e7b9a4c82e790775c45 bqfft
+68f8e88d6d76fc4ca074166cb80979ccbfc2b6c9 bqvec
 896aefe629c85b05ae0880ec93a396b9e3a5a304 dataquay
-ca39a12af53b71e13596a930b828eb1a920238e4 piper-cpp
-1e4f338ae482429a7ab9bdd0825242042354152f sv-dependency-builds
-d45a16c232bd391e6493a160cd1afcabf252191a svcore
-8e846c1aed96189f020024cdadd0d37bf69d3e3a vamp-plugin-sdk
+3257ddb6fff110cc88f3ffeaeefa0f29d5eb3b6f piper-cpp
+e1712f7d74a455337591091a57beba2f0443b9dd sv-dependency-builds
+6974bd4efdb5521eb0d9b61965398a2ded34ab21 svcore
+0eebd22a081a824067bf3d5de65326696feab653 vamp-plugin-sdk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/base.pri	Mon Nov 21 17:08:34 2016 +0000
@@ -0,0 +1,49 @@
+
+SV_INCLUDEPATH = \
+        . \
+	bqvec \
+	bqvec/bqvec \
+	bqfft \
+	piper-cpp \
+	dataquay \
+	dataquay/dataquay \
+	svcore \
+	svcore/data \
+	svcore/plugin/api/alsa \
+	vamp-plugin-sdk
+
+DEPENDPATH += $$SV_INCLUDEPATH
+INCLUDEPATH += $$SV_INCLUDEPATH
+
+# Platform defines for RtMidi
+linux*:   DEFINES += __LINUX_ALSASEQ__
+macx*:    DEFINES += __MACOSX_CORE__
+win*:     DEFINES += __WINDOWS_MM__
+solaris*: DEFINES += __RTMIDI_DUMMY_ONLY__
+
+# Defines for Dataquay
+DEFINES += USE_SORD
+
+DEFINES += NO_HIT_COUNTS
+
+CONFIG += qt thread warn_on stl rtti exceptions c++11
+
+include(bq-files.pri)
+include(vamp-plugin-sdk-files.pri)
+include(svcore/files.pri)
+
+DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES)
+DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS)
+
+for (file, BQ_SOURCES)       { SOURCES += $$file }
+for (file, BQ_HEADERS)       { HEADERS += $$file }
+
+for (file, VAMP_SOURCES)     { SOURCES += $$file }
+for (file, VAMP_HEADERS)     { HEADERS += $$file }
+
+for (file, DATAQUAY_SOURCES) { SOURCES += $$sprintf("dataquay/%1", $$file) }
+for (file, DATAQUAY_HEADERS) { HEADERS += $$sprintf("dataquay/%1", $$file) }
+
+for (file, SVCORE_SOURCES)   { SOURCES += $$sprintf("svcore/%1", $$file) }
+for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
+    
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bq-files.pri	Mon Nov 21 17:08:34 2016 +0000
@@ -0,0 +1,19 @@
+
+BQ_HEADERS += \
+	bqvec/bqvec/Allocators.h \
+	bqvec/bqvec/Barrier.h \
+	bqvec/bqvec/ComplexTypes.h \
+	bqvec/bqvec/Restrict.h \
+	bqvec/bqvec/RingBuffer.h \
+	bqvec/bqvec/VectorOpsComplex.h \
+	bqvec/bqvec/VectorOps.h \
+	bqvec/pommier/neon_mathfun.h \
+	bqvec/pommier/sse_mathfun.h \
+        bqfft/bqfft/FFT.h
+
+BQ_SOURCES += \
+	bqvec/src/Allocators.cpp \
+	bqvec/src/Barrier.cpp \
+	bqvec/src/VectorOpsComplex.cpp \
+        bqfft/src/FFT.cpp
+
--- a/configure	Fri Nov 04 14:16:01 2016 +0000
+++ b/configure	Mon Nov 21 17:08:34 2016 +0000
@@ -620,10 +620,8 @@
 # include <unistd.h>
 #endif"
 
-enable_option_checking=no
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-subdirs
 QMAKE_CONFIG
 HAVES
 CXXFLAGS_MINIMAL
@@ -764,7 +762,7 @@
 mad_LIBS
 id3tag_CFLAGS
 id3tag_LIBS'
-ac_subdirs_all='svcore'
+
 
 # Initialize some variables set by options.
 ac_init_help=
@@ -6438,10 +6436,6 @@
 
 
 
-
-
-subdirs="$subdirs svcore"
-
 ac_config_files="$ac_config_files config.pri"
 
 
@@ -7608,151 +7602,6 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
-  # Remove --cache-file, --srcdir, and --disable-option-checking arguments
-  # so they do not pile up.
-  ac_sub_configure_args=
-  ac_prev=
-  eval "set x $ac_configure_args"
-  shift
-  for ac_arg
-  do
-    if test -n "$ac_prev"; then
-      ac_prev=
-      continue
-    fi
-    case $ac_arg in
-    -cache-file | --cache-file | --cache-fil | --cache-fi \
-    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-      ac_prev=cache_file ;;
-    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
-    | --c=*)
-      ;;
-    --config-cache | -C)
-      ;;
-    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-      ac_prev=srcdir ;;
-    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-      ;;
-    -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-      ac_prev=prefix ;;
-    -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-      ;;
-    --disable-option-checking)
-      ;;
-    *)
-      case $ac_arg in
-      *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-      esac
-      as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
-    esac
-  done
-
-  # Always prepend --prefix to ensure using the same prefix
-  # in subdir configurations.
-  ac_arg="--prefix=$prefix"
-  case $ac_arg in
-  *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
-  # Pass --silent
-  if test "$silent" = yes; then
-    ac_sub_configure_args="--silent $ac_sub_configure_args"
-  fi
-
-  # Always prepend --disable-option-checking to silence warnings, since
-  # different subdirs can have different --enable and --with options.
-  ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
-  ac_popdir=`pwd`
-  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
-    # Do not complain, so a configure script can configure whichever
-    # parts of a large source tree are present.
-    test -d "$srcdir/$ac_dir" || continue
-
-    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
-    $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
-    $as_echo "$ac_msg" >&6
-    as_dir="$ac_dir"; as_fn_mkdir_p
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-    cd "$ac_dir"
-
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      ac_sub_configure=$ac_srcdir/configure.gnu
-    elif test -f "$ac_srcdir/configure"; then
-      ac_sub_configure=$ac_srcdir/configure
-    elif test -f "$ac_srcdir/configure.in"; then
-      # This should be Cygnus configure.
-      ac_sub_configure=$ac_aux_dir/configure
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
-      ac_sub_configure=
-    fi
-
-    # The recursion is here.
-    if test -n "$ac_sub_configure"; then
-      # Make the cache file name correct relative to the subdirectory.
-      case $cache_file in
-      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
-      *) # Relative name.
-	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-      esac
-
-      { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
-      # The eval makes quoting arguments work.
-      eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
-	   --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
-	as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
-    fi
-
-    cd "$ac_popdir"
-  done
-fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
--- a/configure.ac	Fri Nov 04 14:16:01 2016 +0000
+++ b/configure.ac	Mon Nov 21 17:08:34 2016 +0000
@@ -110,7 +110,6 @@
 
 AC_SUBST(QMAKE_CONFIG)
 
-AC_CONFIG_SUBDIRS([svcore])
 AC_CONFIG_FILES([config.pri])
 
 AC_OUTPUT
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/noconfig.pri	Mon Nov 21 17:08:34 2016 +0000
@@ -0,0 +1,109 @@
+
+CONFIG += release
+
+#CONFIG -= release
+#CONFIG += debug
+
+DEFINES += NDEBUG BUILD_RELEASE
+DEFINES += NO_TIMING
+
+# Full set of defines expected for all platforms when we have the
+# sv-dependency-builds subrepo available to provide the dependencies.
+
+DEFINES += \
+        HAVE_BZ2 \
+	HAVE_FFTW3 \
+	HAVE_FFTW3F \
+	HAVE_SNDFILE \
+	HAVE_SAMPLERATE \
+	HAVE_MAD \
+	HAVE_ID3TAG
+        
+# Default set of libs for the above. Config sections below may update
+# these.
+
+LIBS += \
+        -lbz2 \
+	-lrubberband \
+	-lfftw3 \
+	-lfftw3f \
+	-lsndfile \
+	-lFLAC \
+	-logg \
+	-lvorbis \
+	-lvorbisenc \
+	-lvorbisfile \
+	-logg \
+	-lmad \
+	-lid3tag \
+	-lsamplerate \
+	-lz \
+	-lsord-0 \
+	-lserd-0
+
+win32-g++ {
+
+    # This config is currently used for 32-bit Windows builds.
+
+    INCLUDEPATH += sv-dependency-builds/win32-mingw/include
+
+    LIBS += -Lrelease -Lsv-dependency-builds/win32-mingw/lib -L../sonic-annotator/sv-dependency-builds/win32-mingw/lib
+
+    DEFINES += NOMINMAX _USE_MATH_DEFINES USE_OWN_ALIGNED_MALLOC CAPNP_LITE
+
+    QMAKE_CXXFLAGS_RELEASE += -ffast-math
+    
+    LIBS += -lwinmm -lws2_32
+}
+
+win32-msvc* {
+
+    # This config is actually used only for 64-bit Windows builds.
+    # even though the qmake spec is still called win32-msvc*. If
+    # we want to do 32-bit builds with MSVC as well, then we'll
+    # need to add a way to distinguish the two.
+    
+    INCLUDEPATH += sv-dependency-builds/win64-msvc/include
+
+    CONFIG(release) {
+        LIBS += -Lrelease \
+            -L../sonic-annotator/sv-dependency-builds/win64-msvc/lib
+    }
+
+    DEFINES += NOMINMAX _USE_MATH_DEFINES USE_OWN_ALIGNED_MALLOC
+
+    QMAKE_CXXFLAGS_RELEASE += -fp:fast
+
+    # No Ogg/FLAC support in the sndfile build on this platform yet
+    LIBS -= -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile
+
+    # These have different names
+    LIBS -= -lsord-0 -lserd-0
+    LIBS += -lsord -lserd
+    
+    LIBS += -ladvapi32 -lwinmm -lws2_32
+}
+
+macx* {
+
+    # All Mac builds are 64-bit these days.
+
+    INCLUDEPATH += sv-dependency-builds/osx/include
+    LIBS += -Lsv-dependency-builds/osx/lib
+
+    QMAKE_CXXFLAGS_RELEASE += -ffast-math
+
+    DEFINES += MALLOC_IS_ALIGNED HAVE_VDSP
+    LIBS += \
+	-framework CoreFoundation \
+	-framework CoreServices \
+	-framework Accelerate
+}
+
+linux* {
+
+    message("Building without ./configure on Linux is unlikely to work")
+    message("If you really want to try it, remove this from noconfig.pri")
+    error("Refusing to build without ./configure first")
+}
+
--- a/runner.pro	Fri Nov 04 14:16:01 2016 +0000
+++ b/runner.pro	Mon Nov 21 17:08:34 2016 +0000
@@ -1,104 +1,29 @@
+
 TEMPLATE = app
 
-INCLUDEPATH += vamp-plugin-sdk
-
-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
-}
-mac* {
-    INCLUDEPATH += sv-dependency-builds/osx/include
-    LIBS += -Lsv-dependency-builds/osx/lib
-}
-
 exists(config.pri) {
     include(config.pri)
 }
 
 !exists(config.pri) {
-
-    CONFIG += release
-    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
-
-    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_DATAQUAY HAVE_MAD HAVE_ID3TAG
-
-    LIBS += -lbz2 -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lsamplerate -lz -lsord-0 -lserd-0
-
-    win* {
-        DEFINES += _USE_MATH_DEFINES
-        LIBS += -lwinmm -lws2_32
-    }
-    macx* {
-        DEFINES += HAVE_COREAUDIO
-        LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
-    }
-    linux* {
-        LIBS += -ldl
-    }
+    include(noconfig.pri)
 }
 
-CONFIG += qt thread warn_on stl rtti exceptions console c++11
+include(base.pri)
+
+CONFIG += console
 QT += xml network
-QT -= gui widgets
+QT -= gui
 
-# Using the "console" CONFIG flag above should ensure this happens for
-# normal Windows builds, but the console feature doesn't get picked up
-# in my local cross-compile setup because qmake itself doesn't know to
-# look for win32 features
 win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
-
-DEFINES += HAVE_FFTW3 HAVE_VAMP HAVE_VAMPHOSTSDK
+macx*: CONFIG -= app_bundle
 
 TARGET = sonic-annotator
 
-DEPENDPATH += . svcore runner
-INCLUDEPATH += . dataquay svcore runner
-
-QMAKE_LIBDIR = svcore $$QMAKE_LIBDIR
-
-QMAKE_CXXFLAGS_RELEASE += -fmessage-length=80 -fdiagnostics-show-location=every-line
-
 OBJECTS_DIR = o
 MOC_DIR = o
 
-contains(DEFINES, BUILD_STATIC):LIBS -= -ljack
-
-MY_LIBS = -Lsvcore -Ldataquay -lsvcore -ldataquay
-
-linux* {
-MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
-}
-
-win* {
-MY_LIBS = -Lsvcore/release -Ldataquay/release $$MY_LIBS
-}
-
-LIBS = $$MY_LIBS $$LIBS
-
-win* {
-PRE_TARGETDEPS += svcore/release/libsvcore.a
-}
-
-!win* {
-PRE_TARGETDEPS += svcore/libsvcore.a
-}
-
 HEADERS += \
-        vamp-plugin-sdk/vamp-hostsdk/PluginBase.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginBufferingAdapter.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginChannelAdapter.h \
-        vamp-plugin-sdk/vamp-hostsdk/Plugin.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginHostAdapter.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginInputDomainAdapter.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginLoader.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginSummarisingAdapter.h \
-        vamp-plugin-sdk/vamp-hostsdk/PluginWrapper.h \
-        vamp-plugin-sdk/vamp-hostsdk/RealTime.h \
-        vamp-plugin-sdk/src/vamp-hostsdk/Window.h \
 	runner/AudioDBFeatureWriter.h \
         runner/FeatureWriterFactory.h  \
         runner/DefaultFeatureWriter.h \
@@ -109,15 +34,6 @@
         runner/MultiplexedReader.h
 
 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 \
 	runner/main.cpp \
 	runner/DefaultFeatureWriter.cpp \
 	runner/FeatureExtractionManager.cpp \
--- a/sonic-annotator.pro	Fri Nov 04 14:16:01 2016 +0000
+++ b/sonic-annotator.pro	Mon Nov 21 17:08:34 2016 +0000
@@ -1,14 +1,19 @@
 TEMPLATE = subdirs
-SUBDIRS = sub_dataquay svcore sub_runner
 
 !win* {
     # We should build and run the tests on any platform,
     # but doing it automatically doesn't work so well from
     # within an IDE on Windows, so remove that from here
-    SUBDIRS += svcore/data/fileio/test
+    SUBDIRS += \
+	sub_test_svcore_base \
+        sub_test_svcore_data_fileio
 }
 
-sub_dataquay.file = dataquay/lib.pro
+SUBDIRS += sub_runner
+
+sub_test_svcore_base.file = test-svcore-base.pro
+sub_test_svcore_data_fileio.file = test-svcore-data-fileio.pro
 
 sub_runner.file = runner.pro
-sub_runner.depends = svcore
+
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-svcore-base.pro	Mon Nov 21 17:08:34 2016 +0000
@@ -0,0 +1,31 @@
+
+TEMPLATE = app
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+include(base.pri)
+
+CONFIG += console
+QT += network xml testlib
+QT -= gui
+
+win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
+macx*: CONFIG -= app_bundle
+
+TARGET = test-svcore-base
+
+OBJECTS_DIR = o
+MOC_DIR = o
+
+include(svcore/base/test/files.pri)
+
+for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
+for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
+
+QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test-svcore-data-fileio.pro	Mon Nov 21 17:08:34 2016 +0000
@@ -0,0 +1,31 @@
+
+TEMPLATE = app
+
+exists(config.pri) {
+    include(config.pri)
+}
+
+!exists(config.pri) {
+    include(noconfig.pri)
+}
+
+include(base.pri)
+
+CONFIG += console
+QT += network xml testlib
+QT -= gui
+
+win32-x-g++:QMAKE_LFLAGS += -Wl,-subsystem,console
+macx*: CONFIG -= app_bundle
+
+TARGET = test-svcore-data-fileio
+
+OBJECTS_DIR = o
+MOC_DIR = o
+
+include(svcore/data/fileio/test/files.pri)
+
+for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+
+QMAKE_POST_LINK = ./$${TARGET}$${TARGET_EXT}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vamp-plugin-sdk-files.pri	Mon Nov 21 17:08:34 2016 +0000
@@ -0,0 +1,24 @@
+
+VAMP_HEADERS += \
+        vamp-plugin-sdk/vamp-hostsdk/PluginBase.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginBufferingAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginChannelAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/Plugin.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginHostAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginInputDomainAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginLoader.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginSummarisingAdapter.h \
+        vamp-plugin-sdk/vamp-hostsdk/PluginWrapper.h \
+        vamp-plugin-sdk/vamp-hostsdk/RealTime.h \
+        vamp-plugin-sdk/src/vamp-hostsdk/Window.h
+
+VAMP_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