diff --git a/SDL2_image-2.8.2/lib/x64/SDL2_image.dll b/SDL2_image-2.8.2/lib/x64/SDL2_image.dll deleted file mode 100644 index d90de2a301..0000000000 Binary files a/SDL2_image-2.8.2/lib/x64/SDL2_image.dll and /dev/null differ diff --git a/SDL2_image-2.8.2/lib/x64/SDL2_image.lib b/SDL2_image-2.8.2/lib/x64/SDL2_image.lib deleted file mode 100644 index 6c1f59b996..0000000000 Binary files a/SDL2_image-2.8.2/lib/x64/SDL2_image.lib and /dev/null differ diff --git a/SDL2_image-2.8.2/lib/x86/SDL2_image.dll b/SDL2_image-2.8.2/lib/x86/SDL2_image.dll deleted file mode 100644 index f52fccd5a1..0000000000 Binary files a/SDL2_image-2.8.2/lib/x86/SDL2_image.dll and /dev/null differ diff --git a/SDL2_image-2.8.2/lib/x86/SDL2_image.lib b/SDL2_image-2.8.2/lib/x86/SDL2_image.lib deleted file mode 100644 index 3e7fd6f4cb..0000000000 Binary files a/SDL2_image-2.8.2/lib/x86/SDL2_image.lib and /dev/null differ diff --git a/SDL2_image-2.8.3/.git-hash b/SDL2_image-2.8.3/.git-hash new file mode 100644 index 0000000000..37cce469b0 --- /dev/null +++ b/SDL2_image-2.8.3/.git-hash @@ -0,0 +1 @@ +f41ef5debf008a59e903fa89821b6ac6af401773 diff --git a/SDL2_image-2.8.2/CHANGES.txt b/SDL2_image-2.8.3/CHANGES.txt similarity index 100% rename from SDL2_image-2.8.2/CHANGES.txt rename to SDL2_image-2.8.3/CHANGES.txt diff --git a/SDL2_image-2.8.2/LICENSE.txt b/SDL2_image-2.8.3/LICENSE.txt similarity index 100% rename from SDL2_image-2.8.2/LICENSE.txt rename to SDL2_image-2.8.3/LICENSE.txt diff --git a/SDL2_image-2.8.2/README.txt b/SDL2_image-2.8.3/README.txt similarity index 100% rename from SDL2_image-2.8.2/README.txt rename to SDL2_image-2.8.3/README.txt diff --git a/SDL2_image-2.8.2/cmake/sdl2_image-config-version.cmake b/SDL2_image-2.8.3/cmake/sdl2_image-config-version.cmake similarity index 100% rename from SDL2_image-2.8.2/cmake/sdl2_image-config-version.cmake rename to SDL2_image-2.8.3/cmake/sdl2_image-config-version.cmake diff --git a/SDL2_image-2.8.2/cmake/sdl2_image-config.cmake b/SDL2_image-2.8.3/cmake/sdl2_image-config.cmake similarity index 98% rename from SDL2_image-2.8.2/cmake/sdl2_image-config.cmake rename to SDL2_image-2.8.3/cmake/sdl2_image-config.cmake index 6859daa5ac..892a251e23 100644 --- a/SDL2_image-2.8.2/cmake/sdl2_image-config.cmake +++ b/SDL2_image-2.8.3/cmake/sdl2_image-config.cmake @@ -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) diff --git a/SDL2_image-2.8.2/include/SDL_image.h b/SDL2_image-2.8.3/include/SDL_image.h similarity index 99% rename from SDL2_image-2.8.2/include/SDL_image.h rename to SDL2_image-2.8.3/include/SDL_image.h index 138fcbfa2f..3b0e30f082 100644 --- a/SDL2_image-2.8.2/include/SDL_image.h +++ b/SDL2_image-2.8.3/include/SDL_image.h @@ -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 diff --git a/SDL2_image-2.8.3/lib/x64/SDL2_image.dll b/SDL2_image-2.8.3/lib/x64/SDL2_image.dll new file mode 100644 index 0000000000..09406e6ad4 Binary files /dev/null and b/SDL2_image-2.8.3/lib/x64/SDL2_image.dll differ diff --git a/SDL2_image-2.8.3/lib/x64/SDL2_image.lib b/SDL2_image-2.8.3/lib/x64/SDL2_image.lib new file mode 100644 index 0000000000..14f1c83432 Binary files /dev/null and b/SDL2_image-2.8.3/lib/x64/SDL2_image.lib differ diff --git a/SDL2_image-2.8.2/lib/x64/optional/LICENSE.avif.txt b/SDL2_image-2.8.3/lib/x64/optional/LICENSE.avif.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/LICENSE.avif.txt rename to SDL2_image-2.8.3/lib/x64/optional/LICENSE.avif.txt diff --git a/SDL2_image-2.8.2/lib/x64/optional/LICENSE.dav1d.txt b/SDL2_image-2.8.3/lib/x64/optional/LICENSE.dav1d.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/LICENSE.dav1d.txt rename to SDL2_image-2.8.3/lib/x64/optional/LICENSE.dav1d.txt diff --git a/SDL2_image-2.8.2/lib/x64/optional/LICENSE.tiff.txt b/SDL2_image-2.8.3/lib/x64/optional/LICENSE.tiff.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/LICENSE.tiff.txt rename to SDL2_image-2.8.3/lib/x64/optional/LICENSE.tiff.txt diff --git a/SDL2_image-2.8.2/lib/x64/optional/LICENSE.webp.txt b/SDL2_image-2.8.3/lib/x64/optional/LICENSE.webp.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/LICENSE.webp.txt rename to SDL2_image-2.8.3/lib/x64/optional/LICENSE.webp.txt diff --git a/SDL2_image-2.8.2/lib/x64/optional/libavif-16.dll b/SDL2_image-2.8.3/lib/x64/optional/libavif-16.dll similarity index 61% rename from SDL2_image-2.8.2/lib/x64/optional/libavif-16.dll rename to SDL2_image-2.8.3/lib/x64/optional/libavif-16.dll index d6be0c9e7c..6bd52272e5 100644 Binary files a/SDL2_image-2.8.2/lib/x64/optional/libavif-16.dll and b/SDL2_image-2.8.3/lib/x64/optional/libavif-16.dll differ diff --git a/SDL2_image-2.8.2/lib/x64/optional/libtiff-5.dll b/SDL2_image-2.8.3/lib/x64/optional/libtiff-5.dll similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/libtiff-5.dll rename to SDL2_image-2.8.3/lib/x64/optional/libtiff-5.dll diff --git a/SDL2_image-2.8.2/lib/x64/optional/libwebp-7.dll b/SDL2_image-2.8.3/lib/x64/optional/libwebp-7.dll similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/libwebp-7.dll rename to SDL2_image-2.8.3/lib/x64/optional/libwebp-7.dll diff --git a/SDL2_image-2.8.2/lib/x64/optional/libwebpdemux-2.dll b/SDL2_image-2.8.3/lib/x64/optional/libwebpdemux-2.dll similarity index 100% rename from SDL2_image-2.8.2/lib/x64/optional/libwebpdemux-2.dll rename to SDL2_image-2.8.3/lib/x64/optional/libwebpdemux-2.dll diff --git a/SDL2_image-2.8.3/lib/x86/SDL2_image.dll b/SDL2_image-2.8.3/lib/x86/SDL2_image.dll new file mode 100644 index 0000000000..050e999dfb Binary files /dev/null and b/SDL2_image-2.8.3/lib/x86/SDL2_image.dll differ diff --git a/SDL2_image-2.8.3/lib/x86/SDL2_image.lib b/SDL2_image-2.8.3/lib/x86/SDL2_image.lib new file mode 100644 index 0000000000..511c959bb3 Binary files /dev/null and b/SDL2_image-2.8.3/lib/x86/SDL2_image.lib differ diff --git a/SDL2_image-2.8.2/lib/x86/optional/LICENSE.avif.txt b/SDL2_image-2.8.3/lib/x86/optional/LICENSE.avif.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/LICENSE.avif.txt rename to SDL2_image-2.8.3/lib/x86/optional/LICENSE.avif.txt diff --git a/SDL2_image-2.8.2/lib/x86/optional/LICENSE.dav1d.txt b/SDL2_image-2.8.3/lib/x86/optional/LICENSE.dav1d.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/LICENSE.dav1d.txt rename to SDL2_image-2.8.3/lib/x86/optional/LICENSE.dav1d.txt diff --git a/SDL2_image-2.8.2/lib/x86/optional/LICENSE.tiff.txt b/SDL2_image-2.8.3/lib/x86/optional/LICENSE.tiff.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/LICENSE.tiff.txt rename to SDL2_image-2.8.3/lib/x86/optional/LICENSE.tiff.txt diff --git a/SDL2_image-2.8.2/lib/x86/optional/LICENSE.webp.txt b/SDL2_image-2.8.3/lib/x86/optional/LICENSE.webp.txt similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/LICENSE.webp.txt rename to SDL2_image-2.8.3/lib/x86/optional/LICENSE.webp.txt diff --git a/SDL2_image-2.8.2/lib/x86/optional/libavif-16.dll b/SDL2_image-2.8.3/lib/x86/optional/libavif-16.dll similarity index 55% rename from SDL2_image-2.8.2/lib/x86/optional/libavif-16.dll rename to SDL2_image-2.8.3/lib/x86/optional/libavif-16.dll index b8fc01edb3..7cc7954fa5 100644 Binary files a/SDL2_image-2.8.2/lib/x86/optional/libavif-16.dll and b/SDL2_image-2.8.3/lib/x86/optional/libavif-16.dll differ diff --git a/SDL2_image-2.8.2/lib/x86/optional/libtiff-5.dll b/SDL2_image-2.8.3/lib/x86/optional/libtiff-5.dll similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/libtiff-5.dll rename to SDL2_image-2.8.3/lib/x86/optional/libtiff-5.dll diff --git a/SDL2_image-2.8.2/lib/x86/optional/libwebp-7.dll b/SDL2_image-2.8.3/lib/x86/optional/libwebp-7.dll similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/libwebp-7.dll rename to SDL2_image-2.8.3/lib/x86/optional/libwebp-7.dll diff --git a/SDL2_image-2.8.2/lib/x86/optional/libwebpdemux-2.dll b/SDL2_image-2.8.3/lib/x86/optional/libwebpdemux-2.dll similarity index 100% rename from SDL2_image-2.8.2/lib/x86/optional/libwebpdemux-2.dll rename to SDL2_image-2.8.3/lib/x86/optional/libwebpdemux-2.dll diff --git a/msvc/Debug/SDL2_image.dll b/msvc/Debug/SDL2_image.dll index f52fccd5a1..050e999dfb 100644 Binary files a/msvc/Debug/SDL2_image.dll and b/msvc/Debug/SDL2_image.dll differ diff --git a/msvc/Release/SDL2_image.dll b/msvc/Release/SDL2_image.dll index f52fccd5a1..050e999dfb 100644 Binary files a/msvc/Release/SDL2_image.dll and b/msvc/Release/SDL2_image.dll differ diff --git a/msvc/doomretro.vcxproj b/msvc/doomretro.vcxproj index 6135077994..691ba72af1 100644 --- a/msvc/doomretro.vcxproj +++ b/msvc/doomretro.vcxproj @@ -106,7 +106,7 @@ Disabled - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\include WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -131,7 +131,7 @@ MachineX86 false - $(ProjectDir)..\SDL2-2.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86 + $(ProjectDir)..\SDL2-2.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\sdl2_image-2.8.3\lib\x86 false @@ -147,7 +147,7 @@ Disabled - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\include WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug @@ -172,7 +172,7 @@ false - $(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64 + $(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\sdl2_image-2.8.3\lib\x64 false @@ -189,7 +189,7 @@ MaxSpeed true - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\include 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) MultiThreaded true @@ -239,7 +239,7 @@ false true false - $(ProjectDir)..\SDL2-2.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86 + $(ProjectDir)..\SDL2-2.30.10\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\sdl2_image-2.8.3\lib\x86 ..\src\doomretro.manifest @@ -256,7 +256,7 @@ MaxSpeed true - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.10\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\sdl2_image-2.8.3\include 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) MultiThreaded true @@ -306,7 +306,7 @@ false true false - $(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64 + $(ProjectDir)..\SDL2-2.30.10\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\sdl2_image-2.8.3\lib\x64 ..\src\doomretro.manifest diff --git a/msvc/x64/Debug/SDL2_image.dll b/msvc/x64/Debug/SDL2_image.dll index d90de2a301..09406e6ad4 100644 Binary files a/msvc/x64/Debug/SDL2_image.dll and b/msvc/x64/Debug/SDL2_image.dll differ diff --git a/msvc/x64/Release/SDL2_image.dll b/msvc/x64/Release/SDL2_image.dll index d90de2a301..09406e6ad4 100644 Binary files a/msvc/x64/Release/SDL2_image.dll and b/msvc/x64/Release/SDL2_image.dll differ diff --git a/releasenotes.md b/releasenotes.md index f92705aa83..faa2b07e78 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -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.