changeset 558:77754355b37a

macOS build fixes
author Chris Cannam
date Mon, 18 Feb 2019 10:35:39 +0000
parents aec36277d870
children 2d7290b001f2
files chp.pro deploy/osx/deploy.sh noconfig.pri pyin.pro
diffstat 4 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/chp.pro	Mon Feb 18 10:29:36 2019 +0000
+++ b/chp.pro	Mon Feb 18 10:35:39 2019 +0000
@@ -25,7 +25,7 @@
     LIBS += -Wl,--version-script=$$PWD/pyin/vamp-plugin.map
 }
 macx* {
-    LIBS += -export_symbols_list $$PWD/pyin/vamp-plugin.list
+    LIBS += -exported_symbols_list $$PWD/pyin/vamp-plugin.list
 }
 
 SOURCES += \
--- a/deploy/osx/deploy.sh	Mon Feb 18 10:29:36 2019 +0000
+++ b/deploy/osx/deploy.sh	Mon Feb 18 10:35:39 2019 +0000
@@ -44,7 +44,8 @@
 echo "Copying in plugins from pyin/pyin.dylib and chp/chp.dylib."
 echo "(make sure they're present, up-to-date and compiled with optimisation!)"
 
-cp pyin/pyin.dylib chp/chp.dylib "$source/Contents/Resources/"
+cp libpyin.dylib "$source/Contents/Resources/pyin.dylib"
+cp libchp.dylib "$source/Contents/Resources/chp.dylib"
 
 echo
 echo "Copying in frameworks and plugins from Qt installation directory."
--- a/noconfig.pri	Mon Feb 18 10:29:36 2019 +0000
+++ b/noconfig.pri	Mon Feb 18 10:35:39 2019 +0000
@@ -124,6 +124,9 @@
     # All Mac builds are 64-bit these days.
 
     INCLUDEPATH += $$PWD/sv-dependency-builds/osx/include $$PWD/sv-dependency-builds/osx/include/opus
+
+    INCLUDEPATH += /usr/local/opt/boost/include
+
     LIBS += -L$$PWD/sv-dependency-builds/osx/lib -L$$PWD
 
     QMAKE_CXXFLAGS_RELEASE += -O3 -ffast-math -flto
--- a/pyin.pro	Mon Feb 18 10:29:36 2019 +0000
+++ b/pyin.pro	Mon Feb 18 10:35:39 2019 +0000
@@ -25,7 +25,7 @@
     LIBS += -Wl,--version-script=$$PWD/pyin/vamp-plugin.map
 }
 macx* {
-    LIBS += -export_symbols_list $$PWD/pyin/vamp-plugin.list
+    LIBS += -exported_symbols_list $$PWD/pyin/vamp-plugin.list
 }
 
 SOURCES += \