changeset 1152:2e83525cf638 3.0-integration

OSX build fixes
author Chris Cannam
date Wed, 27 Apr 2016 11:04:32 +0100
parents e0aa911e1a8a
children 1e63105fc82d
files .hgsubstate main/main.cpp sv.pro
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Apr 22 11:15:46 2016 +0100
+++ b/.hgsubstate	Wed Apr 27 11:04:32 2016 +0100
@@ -6,6 +6,6 @@
 68ae618c6b0e442d08a71d39217784a08f2a8de3 icons/scalable
 1e4f338ae482429a7ab9bdd0825242042354152f sv-dependency-builds
 c3648c667a0bb9004c97f1997dca22b79c419e12 svapp
-e5a1d815f331275aae137af37e13766c69814e5c svcore
+69c84a66727b69b57e27053c9fa28ec205bc0ec1 svcore
 834e94eb1bca69d909de029705ec3d4b8b7f3204 svgui
 9a2998401bbe0a7b9e3233eeca5004542bc0014d vamp-plugin-sdk
--- a/main/main.cpp	Fri Apr 22 11:15:46 2016 +0100
+++ b/main/main.cpp	Wed Apr 27 11:04:32 2016 +0100
@@ -344,9 +344,15 @@
     helperSuffix = ".exe";
 #endif
     if (!QFile(helperPath + helperSuffix).exists()) {
+        cerr << "NOTE: helper not found at " << (helperPath + helperSuffix)
+             << ", trying in my own directory" << endl;
         helperPath = myDir + "/plugin-checker-helper";
     }
     helperPath += helperSuffix;
+    if (!QFile(helperPath + helperSuffix).exists()) {
+        cerr << "NOTE: helper not found at " << (helperPath + helperSuffix)
+             << endl;
+    }
     PluginScan::getInstance()->scan(helperPath);
     
     // Permit size_t and PropertyName to be used as args in queued signal calls
--- a/sv.pro	Fri Apr 22 11:15:46 2016 +0100
+++ b/sv.pro	Wed Apr 27 11:04:32 2016 +0100
@@ -27,7 +27,7 @@
 
     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
 
-    LIBS += -lbz2 -lrubberband -lvamp-hostsdk -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo
+    LIBS += -lbz2 -lrubberband -lfftw3 -lfftw3f -lsndfile -lFLAC -logg -lvorbis -lvorbisenc -lvorbisfile -logg -lmad -lid3tag -lportaudio -lsamplerate -lz -lsord-0 -lserd-0 -llo
 
     win* {
         LIBS += -lwinmm -lws2_32