# HG changeset patch
# User Chris Cannam
# Date 1583496660 0
# Node ID 732a4bf233dfd40907b5168b40173161c93aac9f
# Parent  7e0d33a25a9d02b47cf0380c7d7243c4826cc2b2
Fixes for static Windows build. In particular, plugins (which are not static) need to be built with "dll" target instead of "plugin" target

diff -r 7e0d33a25a9d -r 732a4bf233df azi.pro
--- a/azi.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/azi.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/azi
 
diff -r 7e0d33a25a9d -r 732a4bf233df bbc-vamp-plugins.pro
--- a/bbc-vamp-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/bbc-vamp-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/bbc-vamp-plugins
 
diff -r 7e0d33a25a9d -r 732a4bf233df beatroot-vamp.pro
--- a/beatroot-vamp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/beatroot-vamp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/beatroot-vamp
 
diff -r 7e0d33a25a9d -r 732a4bf233df cepstral-pitchtracker.pro
--- a/cepstral-pitchtracker.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/cepstral-pitchtracker.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/cepstral-pitchtracker
 
diff -r 7e0d33a25a9d -r 732a4bf233df constant-q-cpp.pro
--- a/constant-q-cpp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/constant-q-cpp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/cqvamp
 
diff -r 7e0d33a25a9d -r 732a4bf233df deploy/clean-build-and-package.bat
--- a/deploy/clean-build-and-package.bat	Fri Mar 06 11:47:15 2020 +0000
+++ b/deploy/clean-build-and-package.bat	Fri Mar 06 12:11:00 2020 +0000
@@ -13,6 +13,7 @@
 @if "%YN%" neq "y" exit /b 3
 
 @echo Proceeding
+del /q /s out
 del /q /s build_win64
 call .\deploy\win64\build-64.bat sign
 if %errorlevel% neq 0 exit /b %errorlevel%
diff -r 7e0d33a25a9d -r 732a4bf233df deploy/win64/build-64.bat
--- a/deploy/win64/build-64.bat	Fri Mar 06 11:47:15 2020 +0000
+++ b/deploy/win64/build-64.bat	Fri Mar 06 12:11:00 2020 +0000
@@ -6,7 +6,7 @@
 set STARTPWD=%CD%
 
 rem  Using Qt Base module thus:
-rem  .\configure -static -static-runtime -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 -nomake examples -prefix C:\Qt\5.14.1-static
 rem  nmake
 rem  nmake install
 rem 
@@ -15,13 +15,15 @@
 rem  nmake
 rem  nmake install
 
-set QTDIR=C:\Qt\5.14.1-static
+set QTDIR=C:\Qt\5.14.1-static-msvc2015
 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"
+rem  Not 2019! Its APIs are too new for use in our static build
+rem set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"
+set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat"
 
 if not exist %vcvarsall% (
 @   echo "Could not find MSVC vars batch file"
@@ -35,6 +37,7 @@
 )
 
 call %vcvarsall% amd64
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 set ORIGINALPATH=%PATH%
 set PATH=%PATH%;%SMLNJDIR%\bin;%QTDIR%\bin
@@ -91,9 +94,11 @@
 @echo Signing plugins and version helper
 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 /a ..\out\*.dll ..\out\*.exe
 signtool verify /pa ..\out\*.dll ..\out\*.exe
+if %errorlevel% neq 0 exit /b %errorlevel%
 )
 
 %QTDIR%\bin\rcc ..\installer.qrc -o o\qrc_installer.cpp
+if %errorlevel% neq 0 exit /b %errorlevel%
 
 qmake -spec win32-msvc -r -tp vc ..\installer.pro
 if %errorlevel% neq 0 exit /b %errorlevel%
@@ -116,6 +121,7 @@
 @echo Signing application
 signtool sign /v /n "%NAME%" /t http://time.certum.pl /fd sha1 /a release\*.exe release\*.dll
 signtool verify /pa "release\Vamp Plugin Pack Installer.exe"
+if %errorlevel% neq 0 exit /b %errorlevel%
 )
 
 cd ..
diff -r 7e0d33a25a9d -r 732a4bf233df marsyas-vamp.pro
--- a/marsyas-vamp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/marsyas-vamp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/mvamp
 
diff -r 7e0d33a25a9d -r 732a4bf233df match-vamp.pro
--- a/match-vamp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/match-vamp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/match-vamp-plugin
 
diff -r 7e0d33a25a9d -r 732a4bf233df nnls-chroma.pro
--- a/nnls-chroma.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/nnls-chroma.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/nnls-chroma
 
diff -r 7e0d33a25a9d -r 732a4bf233df noconfig.pri
--- a/noconfig.pri	Fri Mar 06 11:47:15 2020 +0000
+++ b/noconfig.pri	Fri Mar 06 12:11:00 2020 +0000
@@ -22,7 +22,7 @@
 
     DEFINES += NOMINMAX _USE_MATH_DEFINES HAVE_C99_VARARGS_MACROS _HAS_STD_BYTE=0
 
-    LIBS += -lWindowsApp
+    DEFINES += AVOID_WINRT_DEPENDENCY
 }
 
 macx* {
diff -r 7e0d33a25a9d -r 732a4bf233df pyin.pro
--- a/pyin.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/pyin.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -9,7 +9,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/pyin
 
diff -r 7e0d33a25a9d -r 732a4bf233df qm-vamp-plugins.pro
--- a/qm-vamp-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/qm-vamp-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/qm-vamp-plugins
 
diff -r 7e0d33a25a9d -r 732a4bf233df segmentino.pro
--- a/segmentino.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/segmentino.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/segmentino
 
diff -r 7e0d33a25a9d -r 732a4bf233df silvet.pro
--- a/silvet.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/silvet.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/silvet
 
diff -r 7e0d33a25a9d -r 732a4bf233df tipic.pro
--- a/tipic.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/tipic.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/tipic
 
diff -r 7e0d33a25a9d -r 732a4bf233df tuning-difference.pro
--- a/tuning-difference.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/tuning-difference.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -9,7 +9,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/tuning-difference
 
diff -r 7e0d33a25a9d -r 732a4bf233df ua-vamp-plugins.pro
--- a/ua-vamp-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/ua-vamp-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/ua-vamp-plugins
 
@@ -58,4 +58,3 @@
     vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
     vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
 
-
diff -r 7e0d33a25a9d -r 732a4bf233df vamp-aubio-plugins.pro
--- a/vamp-aubio-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-aubio-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vamp-aubio
 OBJECTS_DIR = vamp-aubio-plugins/o
diff -r 7e0d33a25a9d -r 732a4bf233df vamp-example-plugins.pro
--- a/vamp-example-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-example-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vamp-example-plugins
 
diff -r 7e0d33a25a9d -r 732a4bf233df vamp-fanchirp.pro
--- a/vamp-fanchirp.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-fanchirp.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/fanchirp
 
@@ -51,5 +51,3 @@
     vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \
     vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp
 
-
-
diff -r 7e0d33a25a9d -r 732a4bf233df vamp-libxtract-plugins.pro
--- a/vamp-libxtract-plugins.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-libxtract-plugins.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vamp-libxtract
 
diff -r 7e0d33a25a9d -r 732a4bf233df vamp-simple-cepstrum.pro
--- a/vamp-simple-cepstrum.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-simple-cepstrum.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/simple-cepstrum
 
diff -r 7e0d33a25a9d -r 732a4bf233df vamp-tempogram.pro
--- a/vamp-tempogram.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vamp-tempogram.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/tempogram
 
diff -r 7e0d33a25a9d -r 732a4bf233df vampy.pro
--- a/vampy.pro	Fri Mar 06 11:47:15 2020 +0000
+++ b/vampy.pro	Fri Mar 06 12:11:00 2020 +0000
@@ -10,7 +10,7 @@
 }
 
 CONFIG -= qt
-CONFIG += plugin no_plugin_name_prefix release warn_on
+CONFIG += dll no_plugin_name_prefix release warn_on
 
 TARGET = out/vampy