# HG changeset patch
# User Chris Cannam
# Date 1404468213 -3600
# Node ID 5462ac97d28f6c6376069da4dcbe0697cbfb691a
# Parent  2d5c6920e8142474799147ac6cb2c5a02f7d3d87
OS/X build/deploy fixes

diff -r 2d5c6920e814 -r 5462ac97d28f .hgignore
--- a/.hgignore	Wed Jul 02 22:04:10 2014 +0100
+++ b/.hgignore	Fri Jul 04 11:03:33 2014 +0100
@@ -1,5 +1,5 @@
 syntax: glob
-Makefile
+Makefile*
 */Makefile
 o/*
 */o/*
@@ -21,3 +21,8 @@
 re:^config\.log$
 re:^config\.pri$
 re:^config\.status$
+*.app
+Sonic Visualiser*
+.DS_Store
+*.stash
+
diff -r 2d5c6920e814 -r 5462ac97d28f .hgsubstate
--- a/.hgsubstate	Wed Jul 02 22:04:10 2014 +0100
+++ b/.hgsubstate	Fri Jul 04 11:03:33 2014 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
-3c5adc4a864fa75e5b1e67c260b77541aaa4f1f6 sv-dependency-builds
+879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
 71090a49d487b9eaefc5d2e19e0004b3eabfc5a9 svapp
-a6bfe009523afa92680783318a04878507157820 svcore
+2f6472c74399c8cd688ccb10f56c975940f10a22 svcore
 fd95308b5d3fa6593ce007698c71b5d74d38d05e svgui
diff -r 2d5c6920e814 -r 5462ac97d28f configure.ac
--- a/configure.ac	Wed Jul 02 22:04:10 2014 +0100
+++ b/configure.ac	Fri Jul 04 11:03:33 2014 +0100
@@ -1,5 +1,5 @@
 
-AC_INIT([Sonic Visualiser], [2.3], cannam@all-day-breakfast.com)
+AC_INIT([Sonic Visualiser], [2.4], cannam@all-day-breakfast.com)
 
 AC_CONFIG_SRCDIR(main/main.cpp)
 
diff -r 2d5c6920e814 -r 5462ac97d28f deploy/osx/deploy.sh
--- a/deploy/osx/deploy.sh	Wed Jul 02 22:04:10 2014 +0100
+++ b/deploy/osx/deploy.sh	Fri Jul 04 11:03:33 2014 +0100
@@ -43,6 +43,13 @@
 
 echo "Done"
 
+echo
+echo "Copying in qt.conf to set local-only plugin paths."
+echo "Make sure all necessary Qt plugins are in $target/Contents/plugins/*"
+echo "You probably want platforms/, accessible/ and imageformats/ subdirectories."
+cp deploy/osx/qt.conf "$target"/Contents/Resources/qt.conf
+
+echo
 echo "Writing version $bundleVersion in to bundle."
 echo "(This should be a three-part number: major.minor.point)"
 
diff -r 2d5c6920e814 -r 5462ac97d28f deploy/osx/paths.sh
--- a/deploy/osx/paths.sh	Wed Jul 02 22:04:10 2014 +0100
+++ b/deploy/osx/paths.sh	Fri Jul 04 11:03:33 2014 +0100
@@ -7,24 +7,25 @@
 	exit 2
 fi
 
+frameworks="QtCore QtNetwork QtGui QtXml QtWidgets QtPrintSupport"
+
 echo
-echo "I expect you to have already copied QtCore, QtNetwork, QtGui, QtXml and QtWidgets to "
-echo "$app.app/Contents/Frameworks -- expect errors to follow if they're missing"
+echo "I expect you to have already copied these frameworks from the Qt installation to"
+echo "$app.app/Contents/Frameworks -- expect errors to follow if they're missing:"
+echo "$frameworks"
 echo
 
 echo "Fixing up loader paths in binaries..."
 
-install_name_tool -id QtCore "$app.app/Contents/Frameworks/QtCore"
-install_name_tool -id QtGui "$app.app/Contents/Frameworks/QtGui"
-install_name_tool -id QtNetwork "$app.app/Contents/Frameworks/QtNetwork"
-install_name_tool -id QtXml "$app.app/Contents/Frameworks/QtXml"
-install_name_tool -id QtWidgets "$app.app/Contents/Frameworks/QtWidgets"
+for fwk in $frameworks; do
+    install_name_tool -id $fwk "$app.app/Contents/Frameworks/$fwk"
+done
 
 find "$app.app" -name \*.dylib -print | while read x; do
     install_name_tool -id "`basename \"$x\"`" "$x"
 done
 
-for fwk in QtCore QtGui QtNetwork QtXml QtWidgets; do
+for fwk in $frameworks; do
         find "$app.app" -type f -print | while read x; do
                 current=$(otool -L "$x" | grep "$fwk" | grep amework | awk '{ print $1; }')
                 [ -z "$current" ] && continue
diff -r 2d5c6920e814 -r 5462ac97d28f deploy/osx/qt.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/osx/qt.conf	Fri Jul 04 11:03:33 2014 +0100
@@ -0,0 +1,2 @@
+[Paths]
+Plugins = plugins
diff -r 2d5c6920e814 -r 5462ac97d28f platform-dataquay.pri
--- a/platform-dataquay.pri	Wed Jul 02 22:04:10 2014 +0100
+++ b/platform-dataquay.pri	Fri Jul 04 11:03:33 2014 +0100
@@ -12,8 +12,15 @@
 DEFINES += USE_SORD
 # Libraries and paths should be added by config.pri
 
-win32-g++: {
+win32-g++ {
     INCLUDEPATH += ../sv-dependency-builds/win32-mingw/include
     LIBS += -L../../sv-dependency-builds/win32-mingw/lib
 }
-
+win32-msvc* {
+    INCLUDEPATH += ../sv-dependency-builds/win32-msvc/include
+    LIBS += -L../../sv-dependency-builds/win32-msvc/lib
+}
+mac* {
+    INCLUDEPATH += ../sv-dependency-builds/osx/include
+    LIBS += -L../sv-dependency-builds/osx/lib
+}
diff -r 2d5c6920e814 -r 5462ac97d28f sv.pro
--- a/sv.pro	Wed Jul 02 22:04:10 2014 +0100
+++ b/sv.pro	Fri Jul 04 11:03:33 2014 +0100
@@ -9,15 +9,30 @@
     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)
 }
 
-win* {
-    !exists(config.pri) {
-        DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
-        LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -llo -lz -lsord-0 -lserd-0 -lwinmm -lws2_32
+!exists(config.pri) {
+
+    CONFIG += release
+    DEFINES += NDEBUG BUILD_RELEASE NO_TIMING
+
+    DEFINES += HAVE_BZ2 HAVE_FFTW3 HAVE_FFTW3F HAVE_SNDFILE HAVE_SAMPLERATE HAVE_VAMP HAVE_VAMPHOSTSDK HAVE_RUBBERBAND HAVE_DATAQUAY HAVE_LIBLO HAVE_MAD HAVE_ID3TAG HAVE_PORTAUDIO_2_0
+
+    LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0
+
+    win* {
+        LIBS += -llo -lwinmm -lws2_32
+    }
+    macx* {
+        DEFINES += HAVE_COREAUDIO
+        LIBS += -framework CoreAudio -framework CoreMidi -framework AudioUnit -framework AudioToolbox -framework CoreFoundation -framework CoreServices -framework Accelerate
     }
 }
 
diff -r 2d5c6920e814 -r 5462ac97d28f version.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/version.h	Fri Jul 04 11:03:33 2014 +0100
@@ -0,0 +1,1 @@
+#define SV_VERSION "2.4"