# HG changeset patch
# User Chris Cannam
# Date 1548846154 0
# Node ID 3158bb4e2ce9a78f66bd5c7fa664f12fed329663
# Parent  c3b1e27f65380a073aa4a2d41c4e996e3149c306
Move build-32 to the arguably more sensible win32 location

diff -r c3b1e27f6538 -r 3158bb4e2ce9 deploy/win32/build-32.bat
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/deploy/win32/build-32.bat	Wed Jan 30 11:02:34 2019 +0000
@@ -0,0 +1,59 @@
+rem  Run this from within the top-level SV dir: deploy\win64\build-32.bat
+rem  To build from clean, delete the folder build_win32
+
+set STARTPWD=%CD%
+
+set QTDIR=C:\Qt\5.11.2\mingw53_32
+if not exist %QTDIR% (
+@   echo Could not find 32-bit Qt
+@   exit /b 2
+)
+
+set ORIGINALPATH=%PATH%
+set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;C:\Qt\Tools\mingw530_32\bin
+
+cd %STARTPWD%
+
+call .\repoint install
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+sv-dependency-builds\win32-mingw\bin\capnp -Isv-dependency-builds/win32-mingw/include compile --src-prefix=piper/capnp -osv-dependency-builds/win32-mingw/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+mkdir build_win32
+cd build_win32
+
+qmake -spec win32-g++ -r ..\sonic-visualiser.pro
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+mingw32-make
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+copy .\checker\release\vamp-plugin-load-checker.exe .\release
+
+copy %QTDIR%\bin\Qt5Core.dll .\release
+copy %QTDIR%\bin\Qt5Gui.dll .\release
+copy %QTDIR%\bin\Qt5Widgets.dll .\release
+copy %QTDIR%\bin\Qt5Network.dll .\release
+copy %QTDIR%\bin\Qt5Xml.dll .\release
+copy %QTDIR%\bin\Qt5Svg.dll .\release
+copy %QTDIR%\bin\Qt5Test.dll .\release
+copy %QTDIR%\bin\libgcc_s_dw2-1.dll .\release
+copy %QTDIR%\bin\"libstdc++-6.dll" .\release
+copy %QTDIR%\bin\libwinpthread-1.dll .\release
+copy %QTDIR%\plugins\platforms\qminimal.dll .\release
+copy %QTDIR%\plugins\platforms\qwindows.dll .\release
+copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\release
+
+rem some of these expect to be run from the project root
+cd ..
+build_win32\release\test-svcore-base
+if %errorlevel% neq 0 exit /b %errorlevel%
+build_win32\release\test-svcore-system
+if %errorlevel% neq 0 exit /b %errorlevel%
+build_win32\release\test-svcore-data-fileio
+if %errorlevel% neq 0 exit /b %errorlevel%
+build_win32\release\test-svcore-data-model
+if %errorlevel% neq 0 exit /b %errorlevel%
+
+set PATH=%ORIGINALPATH%
diff -r c3b1e27f6538 -r 3158bb4e2ce9 deploy/win64/build-32.bat
--- a/deploy/win64/build-32.bat	Wed Jan 30 11:02:12 2019 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-rem  Run this from within the top-level SV dir: deploy\win64\build-32.bat
-rem  To build from clean, delete the folder build_win32
-
-set STARTPWD=%CD%
-
-set QTDIR=C:\Qt\5.11.2\mingw53_32
-if not exist %QTDIR% (
-@   echo Could not find 32-bit Qt
-@   exit /b 2
-)
-
-set ORIGINALPATH=%PATH%
-set PATH=%PATH%;C:\Program Files (x86)\SMLNJ\bin;%QTDIR%\bin;C:\Qt\Tools\QtCreator\bin;C:\Qt\Tools\mingw530_32\bin
-
-cd %STARTPWD%
-
-call .\repoint install
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-sv-dependency-builds\win32-mingw\bin\capnp -Isv-dependency-builds/win32-mingw/include compile --src-prefix=piper/capnp -osv-dependency-builds/win32-mingw/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-mkdir build_win32
-cd build_win32
-
-qmake -spec win32-g++ -r ..\sonic-visualiser.pro
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-mingw32-make
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-copy .\checker\release\vamp-plugin-load-checker.exe .\release
-
-copy %QTDIR%\bin\Qt5Core.dll .\release
-copy %QTDIR%\bin\Qt5Gui.dll .\release
-copy %QTDIR%\bin\Qt5Widgets.dll .\release
-copy %QTDIR%\bin\Qt5Network.dll .\release
-copy %QTDIR%\bin\Qt5Xml.dll .\release
-copy %QTDIR%\bin\Qt5Svg.dll .\release
-copy %QTDIR%\bin\Qt5Test.dll .\release
-copy %QTDIR%\bin\libgcc_s_dw2-1.dll .\release
-copy %QTDIR%\bin\"libstdc++-6.dll" .\release
-copy %QTDIR%\bin\libwinpthread-1.dll .\release
-copy %QTDIR%\plugins\platforms\qminimal.dll .\release
-copy %QTDIR%\plugins\platforms\qwindows.dll .\release
-copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\release
-
-rem some of these expect to be run from the project root
-cd ..
-build_win32\release\test-svcore-base
-if %errorlevel% neq 0 exit /b %errorlevel%
-build_win32\release\test-svcore-system
-if %errorlevel% neq 0 exit /b %errorlevel%
-build_win32\release\test-svcore-data-fileio
-if %errorlevel% neq 0 exit /b %errorlevel%
-build_win32\release\test-svcore-data-model
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-set PATH=%ORIGINALPATH%
diff -r c3b1e27f6538 -r 3158bb4e2ce9 deploy/win64/build-and-package.bat
--- a/deploy/win64/build-and-package.bat	Wed Jan 30 11:02:12 2019 +0000
+++ b/deploy/win64/build-and-package.bat	Wed Jan 30 11:02:34 2019 +0000
@@ -38,7 +38,7 @@
 
 cd %STARTPWD%
 del /q /s build_win32
-call .\deploy\win64\build-32.bat
+call .\deploy\win32\build-32.bat
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 if "%ARG%" == "sign" (