stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-26 05:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: GZDB was built against wrong SlimDX version (including 64-bit which was built against 32-bit SlimDX) - (reported by StrikerMan780, leodoom85, Rockstar Racoon)

Browse source
This commit is contained in:
ZZYZX 2018-04-16 01:51:57 +03:00
parent 1e129ba2c3
commit e9c83d0646
8 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Build/SlimDX.dll
View file

Binary file not shown.

BIN
Build/SlimDX.pdb
View file

Binary file not shown.

4
Build/Updater.ini
View file

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

BIN
SlimDX/x64/SlimDX.dll Executable file
View file

Binary file not shown.

BIN
SlimDX/x86/SlimDX.dll Executable file
View file

Binary file not shown.

7
Source/Core/Builder.csproj
View file

@ -590,7 +590,10 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Build\SharpCompress.dll</HintPath> <HintPath>..\..\Build\SharpCompress.dll</HintPath>
</Reference> </Reference>
<Reference Include="SlimDX, Version=2.0.13.43, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86" /> <Reference Include="SlimDX, Version=v4.0.30319, Culture=neutral, PublicKeyToken=b1b0c32fd1ffe4f9, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Build\SlimDX.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core"> <Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework> <RequiredTargetFramework>3.5</RequiredTargetFramework>
@ -1506,6 +1509,8 @@
<PreBuildEvent>echo Current Output Directory: %25cd%25 <PreBuildEvent>echo Current Output Directory: %25cd%25
echo Copying platform-appropriate DevIL.dll file. echo Copying platform-appropriate DevIL.dll file.
copy /Y ..\DevIL\$(PlatformName)\DevIL.dll .\ 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. echo Copying platform-appropriate Updater.ini.
copy /Y ..\UpdaterConfig\Updater-$(PlatformName).ini Updater.ini</PreBuildEvent> copy /Y ..\UpdaterConfig\Updater-$(PlatformName).ini Updater.ini</PreBuildEvent>
<PostBuildEvent>if exist "%25VS140COMNTOOLS%25" goto tools140 <PostBuildEvent>if exist "%25VS140COMNTOOLS%25" goto tools140

4
Source/Core/Properties/AssemblyInfo.cs
View file

@ -30,6 +30,6 @@ using CodeImp.DoomBuilder;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.0.3015")] [assembly: AssemblyVersion("2.3.0.3017")]
[assembly: NeutralResourcesLanguageAttribute("en")] [assembly: NeutralResourcesLanguageAttribute("en")]
[assembly: AssemblyHash("000ecfb")] [assembly: AssemblyHash("1e129ba")]

2
Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs
View file

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