From bf710f9f9c887a31efbf7790d1d46cd992c99424 Mon Sep 17 00:00:00 2001
From: redtide <redtid3@gmail.com>
Date: Fri, 28 Feb 2020 15:29:31 +0100
Subject: [PATCH] Fix InnoSetup x86 build

---
 appveyor.yml  |  1 -
 innosetup.iss | 21 +++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2c74f46b..73728a84 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -33,7 +33,6 @@ after_build:
 - cmd: 7z a sfizz-lv2-%APPVEYOR_REPO_TAG_NAME%-%RELEASE_ARCH%-msvc.zip sfizz.lv2
 - cmd: 7z a sfizz-lib-%APPVEYOR_REPO_TAG_NAME%-%RELEASE_ARCH%-msvc.zip src/Release/sfizz*
 - cmd: iscc.exe /dARCH=%RELEASE_ARCH% ./../innosetup.iss
-- cmd: mv ./../Output/sfizz-lv2-setup.exe sfizz-lv2-%APPVEYOR_REPO_TAG_NAME%-%RELEASE_ARCH%-msvc-setup.exe
 
 artifacts:
 - name: Packages
diff --git a/innosetup.iss b/innosetup.iss
index e022e698..583e6936 100644
--- a/innosetup.iss
+++ b/innosetup.iss
@@ -1,7 +1,11 @@
-#define MyAppName "sfizz-lv2"
-#define MyAppVersion "0.3.0"
+#define MyAppName      "sfizz-lv2"
+#define MyAppVersion   "0.3.0"
 #define MyAppPublisher "sfizz Team"
-#define MyAppURL "https://sfztools.github.io/sfizz/"
+#define MyAppURL       "https://sfztools.github.io/sfizz/"
+
+#ifndef Arch
+#define Arch "x64"
+#endif
 
 [Setup]
 AlwaysShowDirOnReadyPage=yes
@@ -16,15 +20,20 @@ AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 ;AppVerName={#MyAppName} {#MyAppVersion}
 AppVersion={#MyAppVersion}
-ArchitecturesAllowed=x86 x64
-ArchitecturesInstallIn64BitMode=x64
+
+#if Arch=="x64"
+ArchitecturesAllowed=x64
+ArchitecturesInstallIn64BitMode={#Arch}
+#endif
+
 Compression=lzma
 SolidCompression=yes
 DefaultDirName={commoncf}\LV2
 DefaultGroupName={#MyAppPublisher}
 DisableDirPage=yes
 LicenseFile=CMakeBuild\sfizz.lv2\LICENSE.md
-OutputBaseFilename={#MyAppName}-setup
+OutputBaseFileName={#MyAppName}-{#MyAppVersion}-{#Arch}-msvc-setup
+OutputDir=CMakeBuild
 UninstallFilesDir={commonpf}\{#MyAppName}
 WizardImageFile="C:\Program Files (x86)\Inno Setup 6\WizModernImage-IS.bmp"
 WizardSmallImageFile="C:\Program Files (x86)\Inno Setup 6\WizModernSmallImage-IS.bmp"