Mercurial > hg > vamp-plugin-pack
changeset 105:9bdb0b058d0d v1.0-pre1-windows
Fixes for static build on Windows
| author | Chris Cannam |
|---|---|
| date | Mon, 02 Mar 2020 14:04:39 +0000 |
| parents | d12ee4ccda41 |
| children | 564a6697ebb8 |
| files | deploy/win64/build-64.bat installer.pro noconfig.pri repoint-lock.json sord-all.c |
| diffstat | 5 files changed, 19 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/win64/build-64.bat Mon Mar 02 09:47:59 2020 +0000 +++ b/deploy/win64/build-64.bat Mon Mar 02 14:04:39 2020 +0000 @@ -6,12 +6,12 @@ set STARTPWD=%CD% rem Using Qt Base module thus: -rem .\configure -static -release -platform win32-msvc -no-opengl -no-angle -prefix C:\Qt\5.14.1-static +rem .\configure -static -static-runtime -release -platform win32-msvc -no-opengl -no-angle -prefix C:\Qt\5.14.1-static rem nmake rem nmake install rem rem Note you also need the Qt SVG module, in which: -rem c:\qt\5.14.1-static\bin\qmake.exe qtsvg.pro -r -tp vc -spec win32-msvc +rem c:\qt\5.14.1-static\bin\qmake.exe qtsvg.pro -r -spec win32-msvc rem nmake rem nmake install
--- a/installer.pro Mon Mar 02 09:47:59 2020 +0000 +++ b/installer.pro Mon Mar 02 14:04:39 2020 +0000 @@ -62,7 +62,8 @@ vamp-plugin-sdk/src/vamp-hostsdk/PluginLoader.cpp \ vamp-plugin-sdk/src/vamp-hostsdk/PluginSummarisingAdapter.cpp \ vamp-plugin-sdk/src/vamp-hostsdk/PluginWrapper.cpp \ - vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp + vamp-plugin-sdk/src/vamp-hostsdk/RealTime.cpp \ + sord-all.c DATAQUAY_SOURCES=$$fromfile(dataquay/lib.pro, SOURCES) DATAQUAY_HEADERS=$$fromfile(dataquay/lib.pro, HEADERS) @@ -72,19 +73,19 @@ DEFINES += HAVE_SORD HAVE_SERD USE_SORD NDEBUG +INCLUDEPATH += \ + sv-dependency-builds/src/serd-0.18.2/src/ \ + sv-dependency-builds/src/sord-0.12.0/src/ + linux* { - QMAKE_CXXFLAGS += -I/usr/include/sord-0 -I/usr/include/serd-0 - LIBS += -lsord-0 -lserd-0 -ldl + LIBS += -ldl } macx* { - LIBS += -lsord-0 -lserd-0 QMAKE_POST_LINK += deploy/osx/deploy.sh $$shell_quote($$TARGET) } win32* { - LIBS += -lsord -lserd - QMAKE_LFLAGS_RELEASE += -MANIFESTUAC:\"level=\'requireAdministrator\' uiAccess=\'false\'\" }
--- a/noconfig.pri Mon Mar 02 09:47:59 2020 +0000 +++ b/noconfig.pri Mon Mar 02 14:04:39 2020 +0000 @@ -17,7 +17,7 @@ LIBS += -L$$PWD -L$$PWD/sv-dependency-builds/win64-msvc/lib CONFIG(release) { - LIBS += -NODEFAULTLIB:LIBCMT -Lrelease + LIBS += -NODEFAULTLIB:MSVCRT -Lrelease } DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_C99_VARARGS_MACROS _HAS_STD_BYTE=0
--- a/repoint-lock.json Mon Mar 02 09:47:59 2020 +0000 +++ b/repoint-lock.json Mon Mar 02 14:04:39 2020 +0000 @@ -88,7 +88,7 @@ "pin": "1cd161242250" }, "sv-dependency-builds": { - "pin": "ae30d91d2ffe" + "pin": "08ae793730bd" }, "rdf": { "pin": "810e0ce05d50"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sord-all.c Mon Mar 02 14:04:39 2020 +0000 @@ -0,0 +1,8 @@ +#include "sv-dependency-builds/src/serd-0.18.2/src/env.c" +#include "sv-dependency-builds/src/serd-0.18.2/src/node.c" +#include "sv-dependency-builds/src/serd-0.18.2/src/reader.c" +#include "sv-dependency-builds/src/serd-0.18.2/src/string.c" +#include "sv-dependency-builds/src/serd-0.18.2/src/uri.c" +#include "sv-dependency-builds/src/serd-0.18.2/src/writer.c" +#include "sv-dependency-builds/src/sord-0.12.0/src/sord.c" +#include "sv-dependency-builds/src/sord-0.12.0/src/syntax.c"