diff --git a/Source/Installer/Installer.iss b/Source/Installer/Installer.iss
index 5659f651c..002de60ae 100644
--- a/Source/Installer/Installer.iss
+++ b/Source/Installer/Installer.iss
@@ -1,5 +1,5 @@
-#define BaseDir ExtractFilePath(ExtractFilePath(ExtractFilePath(SourcePath)))
-#define AppVersion GetFileVersion(BaseDir + "\Bin\" + Configuration + "\Project64.exe")
+ #define BaseDir ExtractFilePath(ExtractFilePath(ExtractFilePath(SourcePath)))
+#define AppVersion GetFileVersion(BaseDir + "\Bin\" + Platform + "\" + Configuration + "\Project64.exe")
 
 [Setup]
 AppId={{BEB5FB69-4080-466F-96C4-F15DF271718B}
@@ -7,7 +7,7 @@ AppName=Project64
 AppVersion={#AppVersion}
 DefaultDirName={pf32}\Project64 Dev 4.0
 VersionInfoVersion={#AppVersion}
-OutputDir={#BaseDir}\Bin\{#Configuration}
+OutputDir={#BaseDir}\Bin\{#Platform}\{#Configuration}
 OutputBaseFilename=Setup Project64 Dev 4.0
 VersionInfoDescription=Installation Setup of Project64 Dev 4.0
 Compression=lzma2/ultra64
@@ -23,7 +23,7 @@ SetupIconFile={#BaseDir}\Source\Project64\UserInterface\Icons\pj64.ico
 Filename: "{app}\Project64.exe"; Description: "{cm:LaunchProgram,{#StringChange('Project64', '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [Files]
-Source: "{#BaseDir}\Bin\{#Configuration}\Project64.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{#BaseDir}\Bin\{#Platform}\{#Configuration}\Project64.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#BaseDir}\Config\Video.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Audio.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Cheats\*.cht"; DestDir: "{app}\Config\Cheats"
@@ -31,14 +31,14 @@ Source: "{#BaseDir}\Config\Enhancements\*.enh"; DestDir: "{app}\Config\Enhanceme
 Source: "{#BaseDir}\Config\Project64.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.rdx"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Lang\*.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Plugin\{#Configuration}\Audio\Jabo_Dsound.dll"; DestDir: "{app}\Plugin\Audio"
-Source: "{#BaseDir}\Plugin\{#Configuration}\Audio\Project64-Audio.dll"; DestDir: "{app}\Plugin\Audio"
-Source: "{#BaseDir}\Plugin\{#Configuration}\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX"
-Source: "{#BaseDir}\Plugin\{#Configuration}\GFX\Project64-Video.dll"; DestDir: "{app}\Plugin\GFX"
-Source: "{#BaseDir}\Plugin\{#Configuration}\GFX\GLideN64\*"; DestDir: "{app}\Plugin\GFX\GLideN64"; Flags: recursesubdirs skipifsourcedoesntexist
-Source: "{#BaseDir}\Plugin\{#Configuration}\Input\PJ64_NRage.dll"; DestDir: "{app}\Plugin\Input"
-Source: "{#BaseDir}\Plugin\{#Configuration}\Input\Project64-Input.dll"; DestDir: "{app}\Plugin\Input"
-Source: "{#BaseDir}\Plugin\{#Configuration}\RSP\Project64-RSP.dll"; DestDir: "{app}\Plugin\RSP"
+Source: "{#BaseDir}\Plugin\{#Platform}\Audio\Jabo_Dsound.dll"; DestDir: "{app}\Plugin\Audio"
+Source: "{#BaseDir}\Plugin\{#Platform}\Audio\Project64-Audio.dll"; DestDir: "{app}\Plugin\Audio"
+Source: "{#BaseDir}\Plugin\{#Platform}\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX"
+Source: "{#BaseDir}\Plugin\{#Platform}\GFX\Project64-Video.dll"; DestDir: "{app}\Plugin\GFX"
+Source: "{#BaseDir}\Plugin\{#Platform}\GFX\GLideN64\*"; DestDir: "{app}\Plugin\GFX\GLideN64"; Flags: recursesubdirs skipifsourcedoesntexist
+Source: "{#BaseDir}\Plugin\{#Platform}\Input\PJ64_NRage.dll"; DestDir: "{app}\Plugin\Input"
+Source: "{#BaseDir}\Plugin\{#Platform}\Input\Project64-Input.dll"; DestDir: "{app}\Plugin\Input"
+Source: "{#BaseDir}\Plugin\{#Platform}\RSP\Project64-RSP.dll"; DestDir: "{app}\Plugin\RSP"
 Source: "{#BaseDir}\Scripts\example.js"; DestDir: "{app}\Scripts"
 Source: "{#BaseDir}\Scripts\api_documentation.js"; DestDir: "{app}\Scripts"
 Source: "{#BaseDir}\JS-API-Documentation.html"; DestDir: "{app}"
diff --git a/Source/Installer/Installer.vcxproj b/Source/Installer/Installer.vcxproj
index 812f56d42..b6b788722 100644
--- a/Source/Installer/Installer.vcxproj
+++ b/Source/Installer/Installer.vcxproj
@@ -34,6 +34,7 @@
       <Command>"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" "%(Filename).iss"</Command>
       <AdditionalInputs>$(OutDir)Project64.exe;%(AdditionalInputs)</AdditionalInputs>
       <Outputs>$(OutDir)Setup Project64 2.2.exe;%(Outputs)</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">"$(Root)bin\Inno Setup\ISCC.exe" /dConfiguration="$(Configuration)" /dPlatform="$(Platform)" "%(Filename).iss"</Command>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/appveyor.yml b/appveyor.yml
index 9e11159b1..4b9428ce2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,6 +12,7 @@ before_build:
       $version = Source/Script/SetGitProperties.cmd
       appveyor UpdateBuild -Version $version
     }
+  - git submodule update --init --recursive
 build:
   project: Project64.sln
   parallel: true