Mercurial > hg > sonic-visualiser
changeset 1982:a96a5d88a84b
Win32 helper fixes
| author | Chris Cannam |
|---|---|
| date | Mon, 03 Sep 2018 16:15:44 +0100 |
| parents | 30089cc54bac |
| children | b316a89ec6a6 |
| files | deploy/win64/build-32.bat deploy/win64/build-64.bat noconfig.pri repoint-lock.json |
| diffstat | 4 files changed, 19 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/deploy/win64/build-32.bat Mon Sep 03 10:27:32 2018 +0100 +++ b/deploy/win64/build-32.bat Mon Sep 03 16:15:44 2018 +0100 @@ -45,9 +45,11 @@ copy %QTDIR%\plugins\platforms\qwindows.dll .\release copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\release -.\release\test-svcore-base -.\release\test-svcore-system -.\release\test-svcore-data-fileio -.\release\test-svcore-data-model +rem some of these expect to be run from the project root +cd .. +build_win32\release\test-svcore-base +build_win32\release\test-svcore-system +build_win32\release\test-svcore-data-fileio +build_win32\release\test-svcore-data-model set PATH=%ORIGINALPATH%
--- a/deploy/win64/build-64.bat Mon Sep 03 10:27:32 2018 +0100 +++ b/deploy/win64/build-64.bat Mon Sep 03 16:15:44 2018 +0100 @@ -52,9 +52,11 @@ copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\release copy ..\sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll .\release -.\release\test-svcore-base -.\release\test-svcore-system -.\release\test-svcore-data-fileio -.\release\test-svcore-data-model +rem some of these expect to be run from the project root +cd .. +build_win64\release\test-svcore-base +build_win64\release\test-svcore-system +build_win64\release\test-svcore-data-fileio +build_win64\release\test-svcore-data-model set PATH=%ORIGINALPATH%
--- a/noconfig.pri Mon Sep 03 10:27:32 2018 +0100 +++ b/noconfig.pri Mon Sep 03 16:15:44 2018 +0100 @@ -1,7 +1,7 @@ -CONFIG += release c++14 +CONFIG += c++14 -#CONFIG -= release +CONFIG += release #CONFIG += debug PREFIX_PATH = /usr/local @@ -81,11 +81,11 @@ INCLUDEPATH += $$PWD/sv-dependency-builds/win64-msvc/include -## This seems to be intruding even when we're supposed to be release + # This seems to be intruding even when we're supposed to be release # CONFIG(debug) { # LIBS += -NODEFAULTLIB:MSVCRT -Ldebug \ -# -L../sonic-visualiser/sv-dependency-builds/win64-msvc/lib/debug \ -# -L../sonic-visualiser/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 += -Lrelease \
--- a/repoint-lock.json Mon Sep 03 10:27:32 2018 +0100 +++ b/repoint-lock.json Mon Sep 03 16:15:44 2018 +0100 @@ -4,7 +4,7 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "2057423c88fe" + "pin": "d7fdc77252c6" }, "svgui": { "pin": "c0d8356e274f" @@ -13,7 +13,7 @@ "pin": "755fc02a1565" }, "checker": { - "pin": "ad02dff8ebfb" + "pin": "2e8a5f665a07" }, "piper": { "pin": "f5a04ffe4d5a0ae01e77018a86a59b48a425e674"