diff --git a/Build/SlimDX.dll b/Build/SlimDX.dll index 4132e870..ca05cbd7 100755 Binary files a/Build/SlimDX.dll and b/Build/SlimDX.dll differ diff --git a/Build/SlimDX.pdb b/Build/SlimDX.pdb deleted file mode 100644 index 46c24b39..00000000 Binary files a/Build/SlimDX.pdb and /dev/null differ diff --git a/Build/Updater.ini b/Build/Updater.ini index 981d57d0..688eb2ea 100755 --- a/Build/Updater.ini +++ b/Build/Updater.ini @@ -1,4 +1,4 @@ URL http://devbuilds.drdteam.org/gzdbbf/ FileName Builder.exe -UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-[PLATFORM].7z -UpdaterName GZDB_Updater-[PLATFORM].7z \ No newline at end of file +UpdateName GZDoom_Builder_Bugfix-r[REVNUM]-x64.7z +UpdaterName GZDB_Updater-x64.7z \ No newline at end of file diff --git a/SlimDX/x64/SlimDX.dll b/SlimDX/x64/SlimDX.dll new file mode 100755 index 00000000..ca05cbd7 Binary files /dev/null and b/SlimDX/x64/SlimDX.dll differ diff --git a/SlimDX/x86/SlimDX.dll b/SlimDX/x86/SlimDX.dll new file mode 100755 index 00000000..c02903f6 Binary files /dev/null and b/SlimDX/x86/SlimDX.dll differ diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj index 061ac0a7..15b309ca 100644 --- a/Source/Core/Builder.csproj +++ b/Source/Core/Builder.csproj @@ -590,7 +590,10 @@ False ..\..\Build\SharpCompress.dll - + + False + ..\..\Build\SlimDX.dll + 3.5 @@ -1506,6 +1509,8 @@ echo Current Output Directory: %25cd%25 echo Copying platform-appropriate DevIL.dll file. copy /Y ..\DevIL\$(PlatformName)\DevIL.dll .\ +echo Copying platform-appropriate SlimDX.dll file. +copy /Y ..\SlimDX\$(PlatformName)\SlimDX.dll .\ echo Copying platform-appropriate Updater.ini. copy /Y ..\UpdaterConfig\Updater-$(PlatformName).ini Updater.ini if exist "%25VS140COMNTOOLS%25" goto tools140 diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index 781075d3..796f3805 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3015")] +[assembly: AssemblyVersion("2.3.0.3017")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("000ecfb")] +[assembly: AssemblyHash("1e129ba")] diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index badc10fa..056f8a3d 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.3015")] +[assembly: AssemblyVersion("2.3.0.3017")] [assembly: NeutralResourcesLanguageAttribute("en")]