Skip to content

Commit

Permalink
Update to SDL_image v2.8.6
Browse files Browse the repository at this point in the history
  • Loading branch information
bradharding committed Mar 2, 2025
1 parent 7a7a446 commit c2e3514
Show file tree
Hide file tree
Showing 34 changed files with 14 additions and 11 deletions.
1 change: 0 additions & 1 deletion SDL2_image-2.8.5/.git-hash

This file was deleted.

1 change: 1 addition & 0 deletions SDL2_image-2.8.6/.git-hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
770174c726a7dcf9bc506eaae6f0ea3e32172bbc
3 changes: 3 additions & 0 deletions SDL2_image-2.8.5/CHANGES.txt → SDL2_image-2.8.6/CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2.8.6:
* Fixed partial alpha in ICO and CUR images

2.8.5:
* Handle WEBP animation composition

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ extern "C" {
*/
#define SDL_IMAGE_MAJOR_VERSION 2
#define SDL_IMAGE_MINOR_VERSION 8
#define SDL_IMAGE_PATCHLEVEL 5
#define SDL_IMAGE_PATCHLEVEL 6

/**
* This macro can be used to fill a version structure with the compile-time
Expand Down
Binary file not shown.
File renamed without changes.
Binary file not shown.
File renamed without changes.
Binary file modified msvc/Debug/SDL2_image.dll
Binary file not shown.
Binary file modified msvc/Release/SDL2_image.dll
Binary file not shown.
16 changes: 8 additions & 8 deletions msvc/doomretro.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.5\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -131,7 +131,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<GenerateMapFile>false</GenerateMapFile>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.5\lib\x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.6\lib\x86</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<SuppressStartupBanner>false</SuppressStartupBanner>
Expand All @@ -147,7 +147,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.5\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
Expand All @@ -172,7 +172,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<GenerateMapFile>false</GenerateMapFile>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.5\lib\x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.6\lib\x64</AdditionalLibraryDirectories>
</Link>
<ResourceCompile>
<SuppressStartupBanner>false</SuppressStartupBanner>
Expand All @@ -189,7 +189,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.5\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down Expand Up @@ -239,7 +239,7 @@
<EnableUAC>false</EnableUAC>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>false</MapExports>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.5\lib\x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.6\lib\x86</AdditionalLibraryDirectories>
</Link>
<Manifest>
<AdditionalManifestFiles>..\src\doomretro.manifest</AdditionalManifestFiles>
Expand All @@ -256,7 +256,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.5\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_BIND_TO_CURRENT_VCLIBS_VERSION=1;_MSC_PLATFORM_TOOLSET=$(PlatformToolsetVersion);WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
Expand Down Expand Up @@ -305,7 +305,7 @@
<EnableUAC>false</EnableUAC>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>false</MapExports>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.5\lib\x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.6\lib\x64</AdditionalLibraryDirectories>
</Link>
<Manifest>
<AdditionalManifestFiles>..\src\doomretro.manifest</AdditionalManifestFiles>
Expand Down
Binary file modified msvc/x64/Debug/SDL2_image.dll
Binary file not shown.
Binary file modified msvc/x64/Release/SDL2_image.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion releasenotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### DOOM Retro v5.6.3

* *DOOM Retro* is now built using v17.13.2 of [*Microsoft Visual Studio Community 2022*](https://visualstudio.microsoft.com/vs/community/).
* *DOOM Retro* now uses [*SDL v2.32.2*](https://github.com/libsdl-org/SDL/releases/tag/release-2.32.2), [*SDL_mixer v2.8.1*](https://github.com/libsdl-org/SDL_mixer/releases/tag/release-2.8.1) and [*SDL_image v2.8.5*](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.5).
* *DOOM Retro* now uses [*SDL v2.32.2*](https://github.com/libsdl-org/SDL/releases/tag/release-2.32.2), [*SDL_mixer v2.8.1*](https://github.com/libsdl-org/SDL_mixer/releases/tag/release-2.8.1) and [*SDL_image v2.8.6*](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.6).
* Changes have been made to further improve the overall performance and stability of *DOOM Retro*.
* Minor changes have been made to text that is output to the console.
* Very long player messages now wrap to a second line when the `vid_widescreen` CVAR is `on`.
Expand Down

0 comments on commit c2e3514

Please sign in to comment.