Mercurial > hg > tony
changeset 587:2090dd9bfbc1
Windows build updates
author | Chris Cannam |
---|---|
date | Wed, 04 Sep 2019 17:34:28 +0100 |
parents | 1dfdbd017cf5 |
children | 32c76f6baad8 |
files | deploy/win64/build-64.bat main/main.cpp noconfig.pri repoint-lock.json |
diffstat | 4 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/win64/build-64.bat Wed Sep 04 14:19:57 2019 +0100 +++ b/deploy/win64/build-64.bat Wed Sep 04 17:34:28 2019 +0100 @@ -3,7 +3,7 @@ set STARTPWD=%CD% -set QTDIR=C:\Qt\5.12.2\msvc2017_64 +set QTDIR=C:\Qt\5.13.0\msvc2017_64 if not exist %QTDIR% ( @ echo Could not find 64-bit Qt @ exit /b 2
--- a/main/main.cpp Wed Sep 04 14:19:57 2019 +0100 +++ b/main/main.cpp Wed Sep 04 17:34:28 2019 +0100 @@ -42,6 +42,8 @@ #include <signal.h> #include <cstdlib> +#include "../version.h" + #include <vamp-hostsdk/PluginHostAdapter.h> static QMutex cleanupMutex; @@ -194,8 +196,14 @@ int main(int argc, char **argv) { + if (argc == 2 && (QString(argv[1]) == "--version" || + QString(argv[1]) == "-v")) { + cerr << TONY_VERSION << endl; + exit(0); + } + svSystemSpecificInitialisation(); - + #ifdef Q_OS_MAC if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_8) { // Fix for OS/X 10.9 font problem
--- a/noconfig.pri Wed Sep 04 14:19:57 2019 +0100 +++ b/noconfig.pri Wed Sep 04 17:34:28 2019 +0100 @@ -93,8 +93,8 @@ ## This seems to be intruding even when we're supposed to be release # CONFIG(debug) { # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ -# -L../tony/sv-dependency-builds/win64-msvc/lib/debug \ -# -L../tony/sv-dependency-builds/win64-msvc/lib +# -L$$PWD/sv-dependency-builds/win64-msvc/lib/debug \ +# -L$$PWD/sv-dependency-builds/win64-msvc/lib # } CONFIG(release) { LIBS += -NODEFAULTLIB:LIBCMT -Lrelease \ @@ -103,8 +103,8 @@ DEFINES += NOMINMAX _USE_MATH_DEFINES CAPNP_LITE HAVE_MEDIAFOUNDATION - QMAKE_CXXFLAGS_RELEASE += -fp:fast -gl - + QMAKE_CXXFLAGS_RELEASE += -fp:fast + LIBS -= -lFLAC -lvorbis -lvorbisenc -lvorbisfile # These have different names
--- a/repoint-lock.json Wed Sep 04 14:19:57 2019 +0100 +++ b/repoint-lock.json Wed Sep 04 17:34:28 2019 +0100 @@ -4,10 +4,10 @@ "pin": "0b6802e3b755" }, "svcore": { - "pin": "f19711ab7074" + "pin": "e3db163e3f50" }, "svgui": { - "pin": "175770a13495" + "pin": "76b388d4d19c" }, "svapp": { "pin": "162c3f4b870c" @@ -46,7 +46,7 @@ "pin": "1c8844bfa946" }, "pyin": { - "pin": "6f17d912e1dd" + "pin": "81f025823a5c" }, "chp": { "pin": "de970142809f"