Mercurial > hg > vamp-plugin-pack
changeset 25:663baf743c63
MSVC fixes
author | Chris Cannam |
---|---|
date | Mon, 09 Dec 2019 13:56:36 +0000 |
parents | 7aab0b2287c5 |
children | c89d25a0a7a7 |
files | marsyas-link/config.h marsyas-vamp.pro noconfig.pri repoint-lock.json repoint-project.json segmentino.pro tipic.pro ua-vamp-plugins.pro vamp-fanchirp.pro vamp-libxtract-plugins.pro |
diffstat | 10 files changed, 43 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/marsyas-link/config.h Mon Dec 09 09:02:02 2019 +0000 +++ b/marsyas-link/config.h Mon Dec 09 13:56:36 2019 +0000 @@ -0,0 +1,3 @@ +#ifdef MARSYAS_WIN32 +#undef UNICODE // we don't use file APIs, but they seem to be hardwired to char* +#endif
--- a/marsyas-vamp.pro Mon Dec 09 09:02:02 2019 +0000 +++ b/marsyas-vamp.pro Mon Dec 09 13:56:36 2019 +0000 @@ -21,9 +21,11 @@ QMAKE_CXXFLAGS -= -Werror win32-msvc* { + DEFINES += MARSYAS_WIN32 LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* { + DEFINES += MARSYAS_WIN32 LIBS += -Wl,--version-script=$$PWD/marsyas/src/mvamp/vamp-plugin.map } linux* { @@ -58,14 +60,16 @@ SOURCES += \ marsyas/src/marsyas/sched/Scheduler.cpp \ + marsyas/src/marsyas/sched/Repeat.cpp \ + marsyas/src/marsyas/sched/TmTime.cpp \ marsyas/src/marsyas/sched/TmVirtualTime.cpp \ - marsyas/src/marsyas/sched/Repeat.cpp \ marsyas/src/marsyas/sched/TmTimer.cpp \ marsyas/src/marsyas/sched/TmParam.cpp \ marsyas/src/marsyas/sched/TmTimerManager.cpp \ marsyas/src/marsyas/sched/TmControlValue.cpp \ marsyas/src/marsyas/sched/TmRealTime.cpp \ marsyas/src/marsyas/sched/EvEvent.cpp \ + marsyas/src/marsyas/sched/EvValUpd.cpp \ marsyas/src/marsyas/system/MarControl.cpp \ marsyas/src/marsyas/system/MarControlValue.cpp \ marsyas/src/marsyas/system/MarControlManager.cpp \ @@ -88,8 +92,20 @@ marsyas/src/marsyas/basis.cpp \ marsyas/src/marsyas/vmblock.cpp \ marsyas/src/marsyas/lu.cpp \ + marsyas/src/marsyas/expr/Expr.cpp \ + marsyas/src/marsyas/expr/ExNode.cpp \ + marsyas/src/marsyas/expr/ExParser.cpp \ + marsyas/src/marsyas/expr/ExScanner.cpp \ + marsyas/src/marsyas/expr/ExCommon.cpp \ + marsyas/src/marsyas/expr/ExVal.cpp \ + marsyas/src/marsyas/expr/ExSymTbl.cpp \ marsyas/src/otherlibs/libsvm/svm.cpp \ - marsyas/src/otherlibs/liblinear/linear.cpp + marsyas/src/otherlibs/liblinear/linear.cpp \ + marsyas/src/otherlibs/liblinear/tron.cpp \ + marsyas/src/otherlibs/liblinear/blas/dnrm2.c \ + marsyas/src/otherlibs/liblinear/blas/ddot.c \ + marsyas/src/otherlibs/liblinear/blas/daxpy.c \ + marsyas/src/otherlibs/liblinear/blas/dscal.c # All the systems included into MarSystemManager must be compiled in, # otherwise we'll have undefined symbols for their dtors at least even
--- a/noconfig.pri Mon Dec 09 09:02:02 2019 +0000 +++ b/noconfig.pri Mon Dec 09 13:56:36 2019 +0000 @@ -11,7 +11,8 @@ # This config is actually used only for 64-bit Windows builds. - INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0/ + INCLUDEPATH += /Libraries/boost_1_69_0 $$PWD/../boost_1_69_0/ $$PWD/sv-dependency-builds/win64-msvc/include + LIBS += -L$$PWD -L$$PWD/sv-dependency-builds/win64-msvc/lib CONFIG(release) { LIBS += -NODEFAULTLIB:LIBCMT -Lrelease
--- a/repoint-lock.json Mon Dec 09 09:02:02 2019 +0000 +++ b/repoint-lock.json Mon Dec 09 13:56:36 2019 +0000 @@ -70,7 +70,10 @@ "pin": "051771c38f801682c315b84fdd1d9ec8a3c71340" }, "vamp-fanchirp": { - "pin": "cdf7cb06049c" + "pin": "337005419d92" + }, + "vamp-fanchirp/bqvec": { + "pin": "cd235ecbeb31" }, "sv-dependency-builds": { "pin": "d0c2a83c1364"
--- a/repoint-project.json Mon Dec 09 09:02:02 2019 +0000 +++ b/repoint-project.json Mon Dec 09 13:56:36 2019 +0000 @@ -117,7 +117,13 @@ }, "vamp-fanchirp": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware", + "branch": "spect" + }, + "vamp-fanchirp/bqvec": { + "vcs": "hg", + "service": "sourcehut", + "owner": "breakfastquay" }, "sv-dependency-builds": { "vcs": "hg",
--- a/segmentino.pro Mon Dec 09 09:02:02 2019 +0000 +++ b/segmentino.pro Mon Dec 09 13:56:36 2019 +0000 @@ -16,7 +16,7 @@ OBJECTS_DIR = segmentino/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/qm-vamp-plugins/lib $$PWD/qm-vamp-plugins/lib/qm-dsp $$(PWD)/qm-vamp-plugins/lib/qm-dsp/ext/kissfft $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft/tools $$(PWD)/segmentino/armadillo-3.900.4/include +INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/qm-vamp-plugins/lib $$PWD/qm-vamp-plugins/lib/qm-dsp $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft $$PWD/qm-vamp-plugins/lib/qm-dsp/ext/kissfft/tools $$PWD/segmentino/armadillo-3.900.4/include QMAKE_CXXFLAGS -= -Werror
--- a/tipic.pro Mon Dec 09 09:02:02 2019 +0000 +++ b/tipic.pro Mon Dec 09 13:56:36 2019 +0000 @@ -16,13 +16,14 @@ OBJECTS_DIR = tipic/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/tipic/qm-dsp $$(PWD)/tipic/qm-dsp/ext/kissfft $$PWD/tipic/qm-dsp/ext/kissfft/tools +INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/tipic/qm-dsp $$PWD/tipic/qm-dsp/ext/kissfft $$PWD/tipic/qm-dsp/ext/kissfft/tools QMAKE_CXXFLAGS -= -Werror DEFINES += kiss_fft_scalar=double win32-msvc* { + DEFINES += __restrict__=__restrict LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* {
--- a/ua-vamp-plugins.pro Mon Dec 09 09:02:02 2019 +0000 +++ b/ua-vamp-plugins.pro Mon Dec 09 13:56:36 2019 +0000 @@ -21,6 +21,7 @@ QMAKE_CXXFLAGS -= -Werror win32-msvc* { + LIBS += -L$$PWD/sv-dependency-builds/win64-msvc/lib -lfftw3 LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* {
--- a/vamp-fanchirp.pro Mon Dec 09 09:02:02 2019 +0000 +++ b/vamp-fanchirp.pro Mon Dec 09 13:56:36 2019 +0000 @@ -16,11 +16,12 @@ OBJECTS_DIR = vamp-fanchirp/o -INCLUDEPATH += $$PWD/vamp-plugin-sdk +INCLUDEPATH += $$PWD/vamp-plugin-sdk $$PWD/vamp-fanchirp/bqvec QMAKE_CXXFLAGS -= -Werror win32-msvc* { + LIBS += -L$$PWD/sv-dependency-builds/win64-msvc/lib -lfftw3 LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* { @@ -44,6 +45,7 @@ vamp-fanchirp/FChTransformF0gram.cpp \ vamp-fanchirp/FChTransformUtils.cpp \ vamp-fanchirp/plugins.cpp \ + vamp-plugin-sdk/src/vamp-sdk/FFT.cpp \ vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \ vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
--- a/vamp-libxtract-plugins.pro Mon Dec 09 09:02:02 2019 +0000 +++ b/vamp-libxtract-plugins.pro Mon Dec 09 13:56:36 2019 +0000 @@ -21,9 +21,11 @@ QMAKE_CXXFLAGS -= -Werror win32-msvc* { + DEFINES += XTRACT_FFT=1 USE_OOURA=1 NDEBUG LIBS += -EXPORT:vampGetPluginDescriptor } win32-g++* { + DEFINES += XTRACT_FFT=1 USE_OOURA=1 NDEBUG LIBS += -Wl,--version-script=$$PWD/vamp-libxtract-plugins/vamp-plugin.map } linux* {