# HG changeset patch # User Chris Cannam # Date 1574507079 0 # Node ID 1d86ed252be7324ef2d2853efc1bf4552f5049e8 # Parent d3a362b3d5136be0cef0159da8399e5a2001d837 Some Win64 bits diff -r d3a362b3d513 -r 1d86ed252be7 .hgignore --- a/.hgignore Fri Nov 22 09:59:53 2019 +0000 +++ b/.hgignore Sat Nov 23 11:04:39 2019 +0000 @@ -33,3 +33,4 @@ out/*_README.txt out/*_CITATION.txt out/*_COPYING.txt +build_win64 diff -r d3a362b3d513 -r 1d86ed252be7 aubio-link/aubio --- a/aubio-link/aubio Fri Nov 22 09:59:53 2019 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../aubio/src \ No newline at end of file diff -r d3a362b3d513 -r 1d86ed252be7 aubio-link/aubio/aubio.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/aubio-link/aubio/aubio.h Sat Nov 23 11:04:39 2019 +0000 @@ -0,0 +1,3 @@ + +#include "../../aubio/src/aubio.h" + diff -r d3a362b3d513 -r 1d86ed252be7 deploy/win64/build-64.bat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deploy/win64/build-64.bat Sat Nov 23 11:04:39 2019 +0000 @@ -0,0 +1,42 @@ +rem Run this from within the top-level SV dir: deploy\win64\build-64.bat +rem To build from clean, delete the folder build_win64 first + +echo on + +set STARTPWD=%CD% + +set QTDIR=C:\Qt\5.13.2\msvc2017_64 +if not exist %QTDIR% ( +@ echo Could not find 64-bit Qt in %QTDIR% +@ exit /b 2 +) + +set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" + +if not exist %vcvarsall% ( +@ echo "Could not find MSVC vars batch file" +@ exit /b 2 +) + +call %vcvarsall% amd64 + +set ORIGINALPATH=%PATH% +set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin + +cd %STARTPWD% + +call .\repoint install +if %errorlevel% neq 0 exit /b %errorlevel% + +mkdir build_win64 +cd build_win64 + +qmake -spec win32-msvc -r -tp vc ..\vamp-plugin-pack.pro +if %errorlevel% neq 0 exit /b %errorlevel% + +msbuild vamp-plugin-pack.sln /t:Build /p:Configuration=Release +if %errorlevel% neq 0 exit /b %errorlevel% + +cd .. + +set PATH=%ORIGINALPATH% diff -r d3a362b3d513 -r 1d86ed252be7 noconfig.pri --- a/noconfig.pri Fri Nov 22 09:59:53 2019 +0000 +++ b/noconfig.pri Sat Nov 23 11:04:39 2019 +0000 @@ -17,7 +17,7 @@ LIBS += -NODEFAULTLIB:LIBCMT -Lrelease } - DEFINES += NOMINMAX _USE_MATH_DEFINES + DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_C99_VARARGS_MACROS } macx* {