From 232ddfcc79e17a5f67fe7653f41f7d09e3429aa8 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Tue, 24 Mar 2020 19:40:12 +0100
Subject: [PATCH] fixed Windows 32 bit deployment on my PC

---
 .gitignore                 |  1 +
 windows/deploy_windows.bat | 11 +++++++----
 windows/installer.nsi      |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8953b541..2668eede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,7 @@ moc_predefs.h
 src/res/qrc_resources.cpp
 windows/ASIOSDK2
 windows/VC_redist.x64.exe
+windows/vc_redist.x86.exe
 debug/
 jamulus.sln
 jamulus.vcxproj
diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat
index 99b253d0..53d414fd 100755
--- a/windows/deploy_windows.bat
+++ b/windows/deploy_windows.bat
@@ -12,12 +12,15 @@ if "%VSINSTALLDIR%" == "" goto vsenvproblem
 
 rem create visual studio project file ------------------------------------------
 cd ..
-rem set QMAKESPEC=win32-msvc2015
-qmake -tp vc
+qmake -tp vc -spec win32-msvc
+
+rem TODO qmake seems to use the incorrect VS version to create the project file.
+rem      As a quick hack I simply replace the toolset version which seems to work.
+powershell -Command "(gc jamulus.vcxproj) -replace '<PlatformToolset>v141</PlatformToolset>', '<PlatformToolset>v140</PlatformToolset>' | Out-File -encoding ASCII jamulus.vcxproj"
 
 rem clean and compile solution -------------------------------------------------
-devenv Jamulus.vcxproj /Clean "Release|x64"
-devenv Jamulus.vcxproj /Build "Release|x64"
+devenv Jamulus.vcxproj /Clean "Release|x86"
+devenv Jamulus.vcxproj /Build "Release|x86"
 
 rem create installer -----------------------------------------------------------
 cd windows
diff --git a/windows/installer.nsi b/windows/installer.nsi
index b4a84ec0..30b88845 100755
--- a/windows/installer.nsi
+++ b/windows/installer.nsi
@@ -6,7 +6,7 @@
 !define UNINSTALL_EXE     "Uninstall.exe"
 !define INSTALLER_NAME    "Jamulusinstaller.exe"
 !define BINARY_PATH       "..\release\"
-!define VS_REDIST_EXE     "VC_redist.x64.exe"
+!define VS_REDIST_EXE     "vc_redist.x86.exe"
 !define UNINST_KEY        "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
 !define AUTORUN_KEY       "Software\Microsoft\Windows\CurrentVersion\Run"