Made some edits to the build scripts and auto-update routine to support 64-bit updating

Build/Updater.ini

@@ -1,4 +1,4 @@
 URL http://devbuilds.drdteam.org/gzdbbf/
 FileName Builder.exe
-UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z
+UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-[PLATFORM].7z
-UpdaterName GZDB_Updater.7z
+UpdaterName GZDB_Updater-[PLATFORM].7z

Source/Core/Builder.csproj

@@ -1504,7 +1504,9 @@
   <PropertyGroup>
     <PreBuildEvent>echo Current Output Directory: %25cd%25
 echo Copying platform-appropriate DevIL.dll file.
-copy /Y ..\DevIL\$(PlatformName)\DevIL.dll .\</PreBuildEvent>
+copy /Y ..\DevIL\$(PlatformName)\DevIL.dll .\
+echo Copying platform-appropriate Updater.ini.
+copy /Y ..\UpdaterConfig\Updater-$(PlatformName).ini Updater.ini</PreBuildEvent>
     <PostBuildEvent>if exist "%25VS140COMNTOOLS%25" goto tools140 
 if exist "%25VS120COMNTOOLS%25" goto tools120 
 if exist "%25VS110COMNTOOLS%25" goto tools110 

Source/Core/General/UpdateChecker.cs

@@ -79,8 +79,9 @@ namespace CodeImp.DoomBuilder
 			string[] inilines = File.ReadAllLines(inipath);
 			foreach(string line in inilines)
 			{
+                string cplatform = (Environment.Is64BitProcess ? "x64" : "x86");
 				if(line.StartsWith("URL")) url = line.Substring(3).Trim();
-				else if(line.StartsWith("UpdaterName")) updaterpackname = line.Substring(11).Trim();
+				else if(line.StartsWith("UpdaterName")) updaterpackname = line.Substring(11).Trim().Replace("[PLATFORM]", cplatform);
 			}
 
 			if(string.IsNullOrEmpty(url))

Source/Core/Properties/AssemblyInfo.cs

@@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.3011")]
+[assembly: AssemblyVersion("2.3.0.3013")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
-[assembly: AssemblyHash("5344700")]
+[assembly: AssemblyHash("0b14bde")]

Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@ using System.Resources;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.3.0.3011")]
+[assembly: AssemblyVersion("2.3.0.3013")]
 [assembly: NeutralResourcesLanguageAttribute("en")]

Source/Tools/ChangelogMaker/ChangelogMaker.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,11 @@
     <AssemblyName>ChangelogMaker</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>

Source/Tools/Tools.sln

@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2008
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Updater", "Updater\Updater.csproj", "{2A0BA1B2-A0F1-479F-9083-2EC11D6B70DF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionFromEXE", "VersionFromEXE\VersionFromEXE.csproj", "{72734EB9-2733-4C05-A091-7FA591AF53C3}"

Source/Tools/Updater/MainForm.cs

@@ -24,7 +24,9 @@ namespace mxd.GZDBUpdater
 
 		private string processToEnd = string.Empty;
 		private string downloadFile = string.Empty;
+        private string platform = string.Empty;
 		private const string revisionwildcard = "[REVNUM]";
+        private const string platformwildcard = "[PLATFORM]";
 		private string URL = string.Empty;
         private readonly string updateFolder = Application.StartupPath + @"\_update\";
 		private string appFileName = string.Empty;
@@ -272,8 +274,9 @@ namespace mxd.GZDBUpdater
 
 			// Replace wildcard with remoterev
 			downloadFile = downloadFile.Replace(revisionwildcard, remoterev.ToString());
+            downloadFile = downloadFile.Replace(platformwildcard, platform.ToString());
 
-			if(remoterev > 0 && remoterev <= localrev)
+            if (remoterev > 0 && remoterev <= localrev)
 			{
 				URL = string.Empty;
 				ErrorDescription = "Your version is up to date!";
@@ -299,6 +302,10 @@ namespace mxd.GZDBUpdater
 				{
 					downloadFile = line.Substring(10).Trim();
 				}
+                else if(line.StartsWith("Platform"))
+                {
+                    platform = line.Substring(9).Trim();
+                }
 			}
 
 			// Sanity cheks

Source/Tools/Updater/Properties/Resources.Designer.cs

@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.5466
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace mxd.GZDBUpdater.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

Source/Tools/Updater/Updater.csproj

@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,7 +12,7 @@
     <AssemblyName>Updater</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>

Source/Tools/Updater/Updater.ini

@@ -1,4 +1,4 @@
-URL http://devbuilds.drdteam.org/doombuilder2-gzdb/
+URL http://devbuilds.drdteam.org/gzdbbf/
 FileName Builder.exe
-UpdateName GZDoom_Builder-r[REVNUM].7z
+UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z
-UpdaterName GZDB_Updater.7z
+UpdaterName GZDB_Updater-[PLATFORM].7z

Source/Tools/VersionFromEXE/VersionFromEXE.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,11 @@
     <AssemblyName>VersionFromEXE</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>

Source/Tools/VersionFromSVN/VersionFromGIT.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,6 +12,11 @@
     <AssemblyName>VersionFromGIT</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>false</DebugSymbols>

UpdaterConfig/Updater-x64.ini

@@ -0,0 +1,4 @@
+URL http://devbuilds.drdteam.org/gzdbbf/
+FileName Builder.exe
+UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-[PLATFORM].7z
+UpdaterName GZDB_Updater-[PLATFORM].7z

UpdaterConfig/Updater-x86.ini

@@ -0,0 +1,4 @@
+URL http://devbuilds.drdteam.org/gzdbbf/
+FileName Builder.exe
+UpdateName GZDoom_Builder_Bugfix-r[REVNUM].7z
+UpdaterName GZDB_Updater-[PLATFORM].7z

build_git_generic.cmd

@@ -17,7 +17,12 @@ SET STUDIODIR=c:\Program Files (x86)\Microsoft Visual Studio 14.0
 SET HHWDIR=c:\Program Files (x86)\HTML Help Workshop
 SET SEVENZIPDIR=c:\Program Files (x86)\7-Zip
 
-CALL "%STUDIODIR%\Common7\Tools\vsvars32.bat"
+IF NOT DEFINED PLATFORM SET PLATFORM=x86
+
+CALL "%STUDIODIR%\Common7\Tools\vsdevcmd.bat" %PLATFORM%
+ECHO.
+ECHO Building for platform %PLATFORM%
+ECHO.
 
 MKDIR "GIT_Build"
 
@@ -63,12 +68,17 @@ IF NOT EXIST "setenv.bat" GOTO FILEFAIL
 CALL "setenv.bat"
 DEL /F /Q "setenv.bat"
 
+ECHO.
+ECHO Cleaning solution...
+ECHO.
+msbuild.exe Builder.sln /t:Clean
+
 ECHO.
 ECHO Compiling GZDoom Builder core...
 ECHO.
 IF EXIST "Build\Builder.exe" DEL /F /Q "Build\Builder.exe" > NUL
 IF EXIST "Source\Core\obj" RD /S /Q "Source\Core\obj"
-msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Core\Builder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Builder.exe" GOTO FILEFAIL
 
@@ -77,7 +87,7 @@ ECHO Compiling Automap Mode plugin...
 ECHO.
 IF EXIST "Build\Plugins\AutomapMode.dll" DEL /F /Q "Build\Plugins\AutomapMode.dll" > NUL
 IF EXIST "Source\Plugins\AutomapMode\obj" RD /S /Q "Source\Plugins\AutomapMode\obj"
-msbuild "Source\Plugins\AutomapMode\AutomapMode.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\AutomapMode\AutomapMode.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\AutomapMode.dll" GOTO FILEFAIL
 
@@ -86,7 +96,7 @@ ECHO Compiling Builder Effects plugin...
 ECHO.
 IF EXIST "Build\Plugins\BuilderEffects.dll" DEL /F /Q "Build\Plugins\BuilderEffects.dll" > NUL
 IF EXIST "Source\Plugins\BuilderEffects\obj" RD /S /Q "Source\Plugins\BuilderEffects\obj"
-msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\BuilderEffects\BuilderEffects.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\BuilderEffects.dll" GOTO FILEFAIL
 
@@ -95,7 +105,7 @@ ECHO Compiling Builder Modes plugin...
 ECHO.
 IF EXIST "Build\Plugins\BuilderModes.dll" DEL /F /Q "Build\Plugins\BuilderModes.dll" > NUL
 IF EXIST "Source\Plugins\BuilderModes\obj" RD /S /Q "Source\Plugins\BuilderModes\obj"
-msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\BuilderModes\BuilderModes.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\BuilderModes.dll" GOTO FILEFAIL
 
@@ -104,7 +114,7 @@ ECHO Compiling Color Picker plugin...
 ECHO.
 IF EXIST "Build\Plugins\ColorPicker.dll" DEL /F /Q "Build\Plugins\ColorPicker.dll" > NUL
 IF EXIST "Source\Plugins\ColorPicker\obj" RD /S /Q "Source\Plugins\ColorPicker\obj"
-msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\ColorPicker\ColorPicker.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\ColorPicker.dll" GOTO FILEFAIL
 
@@ -113,7 +123,7 @@ ECHO Compiling Comments Panel plugin...
 ECHO.
 IF EXIST "Build\Plugins\CommentsPanel.dll" DEL /F /Q "Build\Plugins\CommentsPanel.dll" > NUL
 IF EXIST "Source\Plugins\CommentsPanel\obj" RD /S /Q "Source\Plugins\CommentsPanel\obj"
-msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\CommentsPanel\CommentsPanel.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\CommentsPanel.dll" GOTO FILEFAIL
 
@@ -122,7 +132,7 @@ ECHO Compiling Nodes Viewer plugin...
 ECHO.
 IF EXIST "Build\Plugins\NodesViewer.dll" DEL /F /Q "Build\Plugins\NodesViewer.dll" > NUL
 IF EXIST "Source\Plugins\NodesViewer\obj" RD /S /Q "Source\Plugins\NodesViewer\obj"
-msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\NodesViewer\NodesViewer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\NodesViewer.dll" GOTO FILEFAIL
 
@@ -131,7 +141,7 @@ ECHO Compiling Sound Propagation Mode plugin...
 ECHO.
 IF EXIST "Build\Plugins\SoundPropagationMode.dll" DEL /F /Q "Build\Plugins\SoundPropagationMode.dll" > NUL
 IF EXIST "Source\Plugins\SoundPropagationMode\obj" RD /S /Q "Source\Plugins\SoundPropagationMode\obj"
-msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\SoundPropagationMode\SoundPropagation.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\SoundPropagationMode.dll" GOTO FILEFAIL
 
@@ -140,7 +150,7 @@ ECHO Compiling Stair Sector Builder plugin...
 ECHO.
 IF EXIST "Build\Plugins\StairSectorBuilder.dll" DEL /F /Q "Build\Plugins\StairSectorBuilder.dll" > NUL
 IF EXIST "Source\Plugins\StairSectorBuilder\obj" RD /S /Q "Source\Plugins\StairSectorBuilder\obj"
-msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\StairSectorBuilder\StairSectorBuilder.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\StairSectorBuilder.dll" GOTO FILEFAIL
 
@@ -149,7 +159,7 @@ ECHO Compiling Tag Explorer plugin...
 ECHO.
 IF EXIST "Build\Plugins\TagExplorer.dll" DEL /F /Q "Build\Plugins\TagExplorer.dll" > NUL
 IF EXIST "Source\Plugins\TagExplorer\obj" RD /S /Q "Source\Plugins\TagExplorer\obj"
-msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\TagExplorer\TagExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\TagExplorer.dll" GOTO FILEFAIL
 
@@ -158,7 +168,7 @@ ECHO Compiling Tag Range plugin...
 ECHO.
 IF EXIST "Build\Plugins\TagRange.dll" DEL /F /Q "Build\Plugins\TagRange.dll" > NUL
 IF EXIST "Source\Plugins\TagRange\obj" RD /S /Q "Source\Plugins\TagRange\obj"
-msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\TagRange\TagRange.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\TagRange.dll" GOTO FILEFAIL
 
@@ -167,7 +177,7 @@ ECHO Compiling Visplane Explorer plugin...
 ECHO.
 IF EXIST "Build\Plugins\VisplaneExplorer.dll" DEL /F /Q "Build\Plugins\VisplaneExplorer.dll" > NUL
 IF EXIST "Source\Plugins\VisplaneExplorer\obj" RD /S /Q "Source\Plugins\VisplaneExplorer\obj"
-msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=x86 /v:minimal
+msbuild "Source\Plugins\VisplaneExplorer\VisplaneExplorer.csproj" /t:Rebuild /p:Configuration=Release /p:Platform=%PLATFORM% /v:minimal
 IF %ERRORLEVEL% NEQ 0 GOTO ERRORFAIL
 IF NOT EXIST "Build\Plugins\VisplaneExplorer.dll" GOTO FILEFAIL
 
@@ -180,14 +190,17 @@ IF %ERRORLEVEL% NEQ 0 GOTO LOGFAIL
 ECHO.
 ECHO Packing release...
 ECHO.
-IF EXIST "GIT_Build\*.7z" DEL /F /Q "GIT_Build\*.7z" > NUL
+IF NOT "%PLATFORM%" == "x86" (SET DEL_PATHSPEC="GIT_Build\GZDoom_Builder*-%PLATFORM%.7z") ELSE (SET DEL_PATHSPEC="GIT_Build\GZDoom_Builder*.7z")
+IF EXIST %DEL_PATHSPEC% DEL /F /Q %DEL_PATHSPEC% > NUL
+IF EXIST "GIT_Build\GZDB_Updater-%PLATFORM%.7z" DEL /F /Q "GIT_Build\GZDB_Updater-%PLATFORM%.7z" > NUL
 "%SEVENZIPDIR%\7z" a .\GIT_Build\gzdb.7z .\Build\* -xr!*.xml -xr!JetBrains.Profiler.Core.Api.dll -xr!ScintillaNET.3.5.pdb -x!Setup
-"%SEVENZIPDIR%\7z" a .\GIT_Build\GZDB_Updater.7z .\Build\Updater.exe .\Build\Updater.ini
+"%SEVENZIPDIR%\7z" a .\GIT_Build\GZDB_Updater-%PLATFORM%.7z .\Build\Updater.exe .\Build\Updater.ini
 IF %ERRORLEVEL% NEQ 0 GOTO PACKFAIL
 IF NOT EXIST .\GIT_Build\gzdb.7z GOTO FILEFAIL
-IF NOT EXIST .\GIT_Build\GZDB_Updater.7z GOTO FILEFAIL
+IF NOT EXIST .\GIT_Build\GZDB_Updater-%PLATFORM%.7z GOTO FILEFAIL
+
+IF NOT "%PLATFORM%" == "x86" (REN "GIT_Build\gzdb.7z" GZDoom_Builder_Bugfix-r%REVISIONNUMBER%-%PLATFORM%.7z) ELSE (REN "GIT_Build\gzdb.7z" GZDoom_Builder_Bugfix-r%REVISIONNUMBER%.7z)
 
-REN "GIT_Build\gzdb.7z" GZDoom_Builder_Bugfix-r%REVISIONNUMBER%.7z
 IF EXIST "Build\Changelog.txt" DEL /F /Q "Build\Changelog.txt" > NUL
 
 @ECHO %REVISIONNUMBER%> .\GIT_Build\Version.txt

build_git_x64.cmd

@@ -0,0 +1,2 @@
+SET PLATFORM=x64
+build_git_generic.cmd

build_git_x86.cmd

@@ -0,0 +1,2 @@
+SET PLATFORM=x86
+build_git_generic.cmd