# HG changeset patch
# User Chris Cannam
# Date 1368103263 -3600
# Node ID 318e2f177ed54cd31ee8f8becd3225ef75019ea0
# Parent  e3b4bac5b11435796524b63915eb6991bacd2abe
Win32 build fixes

diff -r e3b4bac5b114 -r 318e2f177ed5 CHANGELOG
--- a/CHANGELOG	Thu May 09 10:34:52 2013 +0100
+++ b/CHANGELOG	Thu May 09 13:41:03 2013 +0100
@@ -1,8 +1,9 @@
 
-Changes in Sonic Annotator 0.8 since the previous release 0.7:
+Changes in Sonic Annotator 1.0 since the previous release 0.7:
 
  - Fix incorrect samplerate in reading m4a files on OS/X
  - Fix incorrect handling of FixedSampleRate outputs (Vamp SDK fix)
+ - Add tests that use the Vamp test plugin
 
 Changes in Sonic Annotator 0.7 since the previous release 0.6:
 
diff -r e3b4bac5b114 -r 318e2f177ed5 configure.ac
--- a/configure.ac	Thu May 09 10:34:52 2013 +0100
+++ b/configure.ac	Thu May 09 13:41:03 2013 +0100
@@ -1,5 +1,5 @@
 
-AC_INIT([Sonic Annotator], [0.8], cannam@all-day-breakfast.com)
+AC_INIT([Sonic Annotator], [1.0], cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(runner/main.cpp)
 
diff -r e3b4bac5b114 -r 318e2f177ed5 platform-dataquay.pri
--- a/platform-dataquay.pri	Thu May 09 10:34:52 2013 +0100
+++ b/platform-dataquay.pri	Thu May 09 13:41:03 2013 +0100
@@ -1,5 +1,7 @@
 
-include(./config.pri)
+exists(./config.pri) {
+    include(./config.pri)
+}
 
 CONFIG += staticlib
 
diff -r e3b4bac5b114 -r 318e2f177ed5 runner.pro
--- a/runner.pro	Thu May 09 10:34:52 2013 +0100
+++ b/runner.pro	Thu May 09 13:41:03 2013 +0100
@@ -55,9 +55,13 @@
 MY_LIBS = -Wl,-Bstatic $$MY_LIBS -Wl,-Bdynamic
 }
 
+win* {
+MY_LIBS = -Lsvcore/release -Ldataquay/release $$MY_LIBS
+}
+
 LIBS = $$MY_LIBS $$LIBS
 
-PRE_TARGETDEPS += svcore/libsvcore.a
+#PRE_TARGETDEPS += svcore/libsvcore.a
 
 HEADERS += \
 	runner/AudioDBFeatureWriter.h \
diff -r e3b4bac5b114 -r 318e2f177ed5 runner/main.cpp
--- a/runner/main.cpp	Thu May 09 10:34:52 2013 +0100
+++ b/runner/main.cpp	Thu May 09 13:41:03 2013 +0100
@@ -144,7 +144,7 @@
     cerr << "Sonic Annotator v" << RUNNER_VERSION << endl;
     cerr << "A utility for batch feature extraction from audio files." << endl;
     cerr << "Mark Levy, Chris Sutton and Chris Cannam, Queen Mary, University of London." << endl;
-    cerr << "Copyright 2007-2011 Queen Mary, University of London." << endl;
+    cerr << "Copyright 2007-2013 Queen Mary, University of London." << endl;
     cerr << endl;
     cerr << "This program is free software.  You may redistribute copies of it under the" << endl;
     cerr << "terms of the GNU General Public License <http://www.gnu.org/licenses/gpl.html>." << endl;
diff -r e3b4bac5b114 -r 318e2f177ed5 sonic-annotator.pro
--- a/sonic-annotator.pro	Thu May 09 10:34:52 2013 +0100
+++ b/sonic-annotator.pro	Thu May 09 13:41:03 2013 +0100
@@ -1,5 +1,12 @@
 TEMPLATE = subdirs
-SUBDIRS = sub_dataquay svcore svcore/data/fileio/test sub_runner
+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
+}
 
 sub_dataquay.file = dataquay/lib.pro