Skip to content

Commit

Permalink
Update to SDL_image 2.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@bradharding
bradharding committed Dec 18, 2024
1 parent 1e768a9 commit 82a9c03
Show file tree
Hide file tree
Showing 37 changed files with 12 additions and 10 deletions.
Binary file removed SDL2_image-2.8.2/lib/x64/SDL2_image.dll
View file
Binary file not shown.
Binary file removed SDL2_image-2.8.2/lib/x64/SDL2_image.lib
View file
Binary file not shown.
Binary file removed SDL2_image-2.8.2/lib/x86/SDL2_image.dll
View file
Binary file not shown.
Binary file removed SDL2_image-2.8.2/lib/x86/SDL2_image.lib
View file
Binary file not shown.
1 change: 1 addition & 0 deletions SDL2_image-2.8.3/.git-hash
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f41ef5debf008a59e903fa89821b6ac6af401773
0 SDL2_image-2.8.2/CHANGES.txt → SDL2_image-2.8.3/CHANGES.txt
View file
File renamed without changes.
0 SDL2_image-2.8.2/LICENSE.txt → SDL2_image-2.8.3/LICENSE.txt
View file
File renamed without changes.
0 SDL2_image-2.8.2/README.txt → SDL2_image-2.8.3/README.txt
View file
File renamed without changes.
0 ...8.2/cmake/sdl2_image-config-version.cmake → ...8.3/cmake/sdl2_image-config-version.cmake
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...image-2.8.2/cmake/sdl2_image-config.cmake → ...image-2.8.3/cmake/sdl2_image-config.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set_package_properties(SDL2_image PROPERTIES
DESCRIPTION "SDL_image is an image file loading library"
)

cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.0...3.28)

set(SDL2_image_FOUND TRUE)

Expand Down
2 changes: 1 addition & 1 deletion SDL2_image-2.8.2/include/SDL_image.h → SDL2_image-2.8.3/include/SDL_image.h
View file
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 2
#define SDL_IMAGE_PATCHLEVEL 3

/**
* This macro can be used to fill a version structure with the compile-time
Expand Down
Binary file added SDL2_image-2.8.3/lib/x64/SDL2_image.dll
View file
Binary file not shown.
Binary file added SDL2_image-2.8.3/lib/x64/SDL2_image.lib
View file
Binary file not shown.
0 ...e-2.8.2/lib/x64/optional/LICENSE.avif.txt → ...e-2.8.3/lib/x64/optional/LICENSE.avif.txt
View file
File renamed without changes.
0 ...-2.8.2/lib/x64/optional/LICENSE.dav1d.txt → ...-2.8.3/lib/x64/optional/LICENSE.dav1d.txt
View file
File renamed without changes.
0 ...e-2.8.2/lib/x64/optional/LICENSE.tiff.txt → ...e-2.8.3/lib/x64/optional/LICENSE.tiff.txt
View file
File renamed without changes.
0 ...e-2.8.2/lib/x64/optional/LICENSE.webp.txt → ...e-2.8.3/lib/x64/optional/LICENSE.webp.txt
View file
File renamed without changes.
Binary file renamed ...age-2.8.2/lib/x64/optional/libavif-16.dll → ...age-2.8.3/lib/x64/optional/libavif-16.dll
View file
Binary file not shown.
0 ...mage-2.8.2/lib/x64/optional/libtiff-5.dll → ...mage-2.8.3/lib/x64/optional/libtiff-5.dll
View file
File renamed without changes.
0 ...mage-2.8.2/lib/x64/optional/libwebp-7.dll → ...mage-2.8.3/lib/x64/optional/libwebp-7.dll
View file
File renamed without changes.
0 ...2.8.2/lib/x64/optional/libwebpdemux-2.dll → ...2.8.3/lib/x64/optional/libwebpdemux-2.dll
View file
File renamed without changes.
Binary file added SDL2_image-2.8.3/lib/x86/SDL2_image.dll
View file
Binary file not shown.
Binary file added SDL2_image-2.8.3/lib/x86/SDL2_image.lib
View file
Binary file not shown.
0 ...e-2.8.2/lib/x86/optional/LICENSE.avif.txt → ...e-2.8.3/lib/x86/optional/LICENSE.avif.txt
View file
File renamed without changes.
0 ...-2.8.2/lib/x86/optional/LICENSE.dav1d.txt → ...-2.8.3/lib/x86/optional/LICENSE.dav1d.txt
View file
File renamed without changes.
0 ...e-2.8.2/lib/x86/optional/LICENSE.tiff.txt → ...e-2.8.3/lib/x86/optional/LICENSE.tiff.txt
View file
File renamed without changes.
0 ...e-2.8.2/lib/x86/optional/LICENSE.webp.txt → ...e-2.8.3/lib/x86/optional/LICENSE.webp.txt
View file
File renamed without changes.
Binary file renamed ...age-2.8.2/lib/x86/optional/libavif-16.dll → ...age-2.8.3/lib/x86/optional/libavif-16.dll
View file
Binary file not shown.
0 ...mage-2.8.2/lib/x86/optional/libtiff-5.dll → ...mage-2.8.3/lib/x86/optional/libtiff-5.dll
View file
File renamed without changes.
0 ...mage-2.8.2/lib/x86/optional/libwebp-7.dll → ...mage-2.8.3/lib/x86/optional/libwebp-7.dll
View file
File renamed without changes.
0 ...2.8.2/lib/x86/optional/libwebpdemux-2.dll → ...2.8.3/lib/x86/optional/libwebpdemux-2.dll
View file
File renamed without changes.
Binary file modified msvc/Debug/SDL2_image.dll
View file
Binary file not shown.
Binary file modified msvc/Release/SDL2_image.dll
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions msvc/doomretro.vcxproj
View file
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.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\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.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\sdl2_image-2.8.3\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.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\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.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\sdl2_image-2.8.3\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.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\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.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\sdl2_image-2.8.3\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.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\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 @@ -306,7 +306,7 @@
<EnableUAC>false</EnableUAC>
<GenerateMapFile>true</GenerateMapFile>
<MapExports>false</MapExports>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\sdl2_image-2.8.3\lib\x64</AdditionalLibraryDirectories>
</Link>
<Manifest>
<AdditionalManifestFiles>..\src\doomretro.manifest</AdditionalManifestFiles>
Expand Down
Binary file modified msvc/x64/Debug/SDL2_image.dll
View file
Binary file not shown.
Binary file modified msvc/x64/Release/SDL2_image.dll
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releasenotes.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### DOOM Retro v5.6.1

* *DOOM Retro* now uses [*SDL_image v2.8.3*](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.3).
* An error is no longer displayed when trying to load the *BFG Edition* of *DOOM II*.
* Weapons that use the [*MBF21*](https://doomwiki.org/wiki/MBF21)-compatible `A_ConsumeAmmo` code pointer no longer consume ammo if the `infiniteammo` CCMD is used.

Expand Down

0 comments on commit 82a9c03

Please sign in to comment.