Mercurial > hg > vamp-plugin-pack
changeset 21:de97eaf74910
MacOS build fixes
| author | Chris Cannam |
|---|---|
| date | Fri, 06 Dec 2019 13:50:53 +0000 |
| parents | c9bf3e295b66 |
| children | 879715c205e2 |
| files | .hgignore marsyas-link/malloc.h noconfig.pri repoint-lock.json ua-vamp-plugins.pro vamp-libxtract-plugins.pro |
| diffstat | 6 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Fri Dec 06 13:24:11 2019 +0000 +++ b/.hgignore Fri Dec 06 13:50:53 2019 +0000 @@ -36,3 +36,4 @@ out/*_CITATION.txt out/*_COPYING.txt build_win64 +*.orig
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/marsyas-link/malloc.h Fri Dec 06 13:50:53 2019 +0000 @@ -0,0 +1,3 @@ +#ifdef __MACH__ +#include <stdlib.h> +#endif
--- a/noconfig.pri Fri Dec 06 13:24:11 2019 +0000 +++ b/noconfig.pri Fri Dec 06 13:50:53 2019 +0000 @@ -24,10 +24,8 @@ # All Mac builds are 64-bit these days. - INCLUDEPATH += - LIBS += -L$$PWD - - INCLUDEPATH += /usr/local/opt/boost/include + INCLUDEPATH += /usr/local/opt/boost/include $$PWD/sv-dependency-builds/osx/include + LIBS += -L$$PWD -L$$PWD/sv-dependency-builds/osx/lib QMAKE_CXXFLAGS_RELEASE += -O3 -flto QMAKE_LFLAGS_RELEASE += -O3 -flto
--- a/repoint-lock.json Fri Dec 06 13:24:11 2019 +0000 +++ b/repoint-lock.json Fri Dec 06 13:50:53 2019 +0000 @@ -34,7 +34,7 @@ "pin": "3faac48d491d" }, "azi": { - "pin": "39a06bc19a36" + "pin": "230562aa012d" }, "vamp-simple-cepstrum": { "pin": "a488dd5e4fb8"
--- a/ua-vamp-plugins.pro Fri Dec 06 13:24:11 2019 +0000 +++ b/ua-vamp-plugins.pro Fri Dec 06 13:50:53 2019 +0000 @@ -30,7 +30,7 @@ LIBS += -Wl,-Bstatic -Lsv-dependency-builds/linux/lib/fftw-3.3.8-x86_64 -lfftw3 -Wl,-Bdynamic -Wl,--version-script=$$PWD/ua-vamp-plugins/vamp-plugin.map -Wl,-no-undefined } macx* { - LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list + LIBS += -exported_symbols_list $$PWD/ua-vamp-plugins/vamp-plugin.list -lfftw3 } !win* { QMAKE_POST_LINK += \
--- a/vamp-libxtract-plugins.pro Fri Dec 06 13:24:11 2019 +0000 +++ b/vamp-libxtract-plugins.pro Fri Dec 06 13:50:53 2019 +0000 @@ -32,7 +32,7 @@ } macx* { DEFINES += XTRACT_FFT=1 NDEBUG - LIBS += -exported_symbols_list $$PWD/vamp-libxtract-plugins/vamp-plugin.list + LIBS += -exported_symbols_list $$PWD/vamp-libxtract-plugins/vamp-plugin.list -framework Accelerate } !win* { QMAKE_POST_LINK += \