diff --git a/SDL2_image-2.8.6/.git-hash b/SDL2_image-2.8.6/.git-hash deleted file mode 100644 index 2075378cf..000000000 --- a/SDL2_image-2.8.6/.git-hash +++ /dev/null @@ -1 +0,0 @@ -770174c726a7dcf9bc506eaae6f0ea3e32172bbc diff --git a/SDL2_image-2.8.8/.git-hash b/SDL2_image-2.8.8/.git-hash new file mode 100644 index 000000000..820b79fe4 --- /dev/null +++ b/SDL2_image-2.8.8/.git-hash @@ -0,0 +1 @@ +c1bf2245b0ba63a25afe2f8574d305feca25af77 diff --git a/SDL2_image-2.8.6/CHANGES.txt b/SDL2_image-2.8.8/CHANGES.txt similarity index 99% rename from SDL2_image-2.8.6/CHANGES.txt rename to SDL2_image-2.8.8/CHANGES.txt index 7fbd880d5..100bb287b 100644 --- a/SDL2_image-2.8.6/CHANGES.txt +++ b/SDL2_image-2.8.8/CHANGES.txt @@ -1,3 +1,6 @@ +2.8.8: + * Fixed alpha in less than 32-bit ICO and CUR images + 2.8.6: * Fixed partial alpha in ICO and CUR images diff --git a/SDL2_image-2.8.6/LICENSE.txt b/SDL2_image-2.8.8/LICENSE.txt similarity index 100% rename from SDL2_image-2.8.6/LICENSE.txt rename to SDL2_image-2.8.8/LICENSE.txt diff --git a/SDL2_image-2.8.6/README.txt b/SDL2_image-2.8.8/README.txt similarity index 100% rename from SDL2_image-2.8.6/README.txt rename to SDL2_image-2.8.8/README.txt diff --git a/SDL2_image-2.8.6/cmake/sdl2_image-config-version.cmake b/SDL2_image-2.8.8/cmake/sdl2_image-config-version.cmake similarity index 100% rename from SDL2_image-2.8.6/cmake/sdl2_image-config-version.cmake rename to SDL2_image-2.8.8/cmake/sdl2_image-config-version.cmake diff --git a/SDL2_image-2.8.6/cmake/sdl2_image-config.cmake b/SDL2_image-2.8.8/cmake/sdl2_image-config.cmake similarity index 100% rename from SDL2_image-2.8.6/cmake/sdl2_image-config.cmake rename to SDL2_image-2.8.8/cmake/sdl2_image-config.cmake diff --git a/SDL2_image-2.8.6/include/SDL_image.h b/SDL2_image-2.8.8/include/SDL_image.h similarity index 99% rename from SDL2_image-2.8.6/include/SDL_image.h rename to SDL2_image-2.8.8/include/SDL_image.h index 8fb750c85..34fca876f 100644 --- a/SDL2_image-2.8.6/include/SDL_image.h +++ b/SDL2_image-2.8.8/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 6 +#define SDL_IMAGE_PATCHLEVEL 8 /** * This macro can be used to fill a version structure with the compile-time diff --git a/SDL2_image-2.8.6/lib/x64/SDL2_image.dll b/SDL2_image-2.8.8/lib/x64/SDL2_image.dll similarity index 65% rename from SDL2_image-2.8.6/lib/x64/SDL2_image.dll rename to SDL2_image-2.8.8/lib/x64/SDL2_image.dll index e2eb9af59..5c2417fda 100644 Binary files a/SDL2_image-2.8.6/lib/x64/SDL2_image.dll and b/SDL2_image-2.8.8/lib/x64/SDL2_image.dll differ diff --git a/SDL2_image-2.8.6/lib/x64/SDL2_image.lib b/SDL2_image-2.8.8/lib/x64/SDL2_image.lib similarity index 100% rename from SDL2_image-2.8.6/lib/x64/SDL2_image.lib rename to SDL2_image-2.8.8/lib/x64/SDL2_image.lib diff --git a/SDL2_image-2.8.6/lib/x64/optional/LICENSE.avif.txt b/SDL2_image-2.8.8/lib/x64/optional/LICENSE.avif.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/LICENSE.avif.txt rename to SDL2_image-2.8.8/lib/x64/optional/LICENSE.avif.txt diff --git a/SDL2_image-2.8.6/lib/x64/optional/LICENSE.dav1d.txt b/SDL2_image-2.8.8/lib/x64/optional/LICENSE.dav1d.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/LICENSE.dav1d.txt rename to SDL2_image-2.8.8/lib/x64/optional/LICENSE.dav1d.txt diff --git a/SDL2_image-2.8.6/lib/x64/optional/LICENSE.tiff.txt b/SDL2_image-2.8.8/lib/x64/optional/LICENSE.tiff.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/LICENSE.tiff.txt rename to SDL2_image-2.8.8/lib/x64/optional/LICENSE.tiff.txt diff --git a/SDL2_image-2.8.6/lib/x64/optional/LICENSE.webp.txt b/SDL2_image-2.8.8/lib/x64/optional/LICENSE.webp.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/LICENSE.webp.txt rename to SDL2_image-2.8.8/lib/x64/optional/LICENSE.webp.txt diff --git a/SDL2_image-2.8.6/lib/x64/optional/libavif-16.dll b/SDL2_image-2.8.8/lib/x64/optional/libavif-16.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/libavif-16.dll rename to SDL2_image-2.8.8/lib/x64/optional/libavif-16.dll diff --git a/SDL2_image-2.8.6/lib/x64/optional/libtiff-5.dll b/SDL2_image-2.8.8/lib/x64/optional/libtiff-5.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/libtiff-5.dll rename to SDL2_image-2.8.8/lib/x64/optional/libtiff-5.dll diff --git a/SDL2_image-2.8.6/lib/x64/optional/libwebp-7.dll b/SDL2_image-2.8.8/lib/x64/optional/libwebp-7.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/libwebp-7.dll rename to SDL2_image-2.8.8/lib/x64/optional/libwebp-7.dll diff --git a/SDL2_image-2.8.6/lib/x64/optional/libwebpdemux-2.dll b/SDL2_image-2.8.8/lib/x64/optional/libwebpdemux-2.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x64/optional/libwebpdemux-2.dll rename to SDL2_image-2.8.8/lib/x64/optional/libwebpdemux-2.dll diff --git a/SDL2_image-2.8.6/lib/x86/SDL2_image.dll b/SDL2_image-2.8.8/lib/x86/SDL2_image.dll similarity index 90% rename from SDL2_image-2.8.6/lib/x86/SDL2_image.dll rename to SDL2_image-2.8.8/lib/x86/SDL2_image.dll index 7cc66f1b0..8454706ed 100644 Binary files a/SDL2_image-2.8.6/lib/x86/SDL2_image.dll and b/SDL2_image-2.8.8/lib/x86/SDL2_image.dll differ diff --git a/SDL2_image-2.8.6/lib/x86/SDL2_image.lib b/SDL2_image-2.8.8/lib/x86/SDL2_image.lib similarity index 100% rename from SDL2_image-2.8.6/lib/x86/SDL2_image.lib rename to SDL2_image-2.8.8/lib/x86/SDL2_image.lib diff --git a/SDL2_image-2.8.6/lib/x86/optional/LICENSE.avif.txt b/SDL2_image-2.8.8/lib/x86/optional/LICENSE.avif.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/LICENSE.avif.txt rename to SDL2_image-2.8.8/lib/x86/optional/LICENSE.avif.txt diff --git a/SDL2_image-2.8.6/lib/x86/optional/LICENSE.dav1d.txt b/SDL2_image-2.8.8/lib/x86/optional/LICENSE.dav1d.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/LICENSE.dav1d.txt rename to SDL2_image-2.8.8/lib/x86/optional/LICENSE.dav1d.txt diff --git a/SDL2_image-2.8.6/lib/x86/optional/LICENSE.tiff.txt b/SDL2_image-2.8.8/lib/x86/optional/LICENSE.tiff.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/LICENSE.tiff.txt rename to SDL2_image-2.8.8/lib/x86/optional/LICENSE.tiff.txt diff --git a/SDL2_image-2.8.6/lib/x86/optional/LICENSE.webp.txt b/SDL2_image-2.8.8/lib/x86/optional/LICENSE.webp.txt similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/LICENSE.webp.txt rename to SDL2_image-2.8.8/lib/x86/optional/LICENSE.webp.txt diff --git a/SDL2_image-2.8.6/lib/x86/optional/libavif-16.dll b/SDL2_image-2.8.8/lib/x86/optional/libavif-16.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/libavif-16.dll rename to SDL2_image-2.8.8/lib/x86/optional/libavif-16.dll diff --git a/SDL2_image-2.8.6/lib/x86/optional/libtiff-5.dll b/SDL2_image-2.8.8/lib/x86/optional/libtiff-5.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/libtiff-5.dll rename to SDL2_image-2.8.8/lib/x86/optional/libtiff-5.dll diff --git a/SDL2_image-2.8.6/lib/x86/optional/libwebp-7.dll b/SDL2_image-2.8.8/lib/x86/optional/libwebp-7.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/libwebp-7.dll rename to SDL2_image-2.8.8/lib/x86/optional/libwebp-7.dll diff --git a/SDL2_image-2.8.6/lib/x86/optional/libwebpdemux-2.dll b/SDL2_image-2.8.8/lib/x86/optional/libwebpdemux-2.dll similarity index 100% rename from SDL2_image-2.8.6/lib/x86/optional/libwebpdemux-2.dll rename to SDL2_image-2.8.8/lib/x86/optional/libwebpdemux-2.dll diff --git a/msvc/Debug/SDL2_image.dll b/msvc/Debug/SDL2_image.dll index 7cc66f1b0..8454706ed 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 7cc66f1b0..8454706ed 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 6c1848a8b..f15e89ff1 100644 --- a/msvc/doomretro.vcxproj +++ b/msvc/doomretro.vcxproj @@ -106,7 +106,7 @@ Disabled - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.8\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.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.6\lib\x86 + $(ProjectDir)..\SDL2-2.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.8\lib\x86 false @@ -147,7 +147,7 @@ Disabled - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.8\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.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.6\lib\x64 + $(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.8\lib\x64 false @@ -189,7 +189,7 @@ MaxSpeed true - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.8\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.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.6\lib\x86 + $(ProjectDir)..\SDL2-2.32.2\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x86;$(ProjectDir)..\SDL2_image-2.8.8\lib\x86 ..\src\doomretro.manifest @@ -256,7 +256,7 @@ MaxSpeed true - $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.6\include + $(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.32.2\include;$(ProjectDir)..\SDL2_mixer-2.8.1\include;$(ProjectDir)..\SDL2_image-2.8.8\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 @@ -305,7 +305,7 @@ false true false - $(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.6\lib\x64 + $(ProjectDir)..\SDL2-2.32.2\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.1\lib\x64;$(ProjectDir)..\SDL2_image-2.8.8\lib\x64 ..\src\doomretro.manifest diff --git a/msvc/x64/Debug/SDL2_image.dll b/msvc/x64/Debug/SDL2_image.dll index e2eb9af59..5c2417fda 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 e2eb9af59..5c2417fda 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 03a00cb2d..e6dd4df22 100644 --- a/releasenotes.md +++ b/releasenotes.md @@ -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.6*](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.6). +* *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.8*](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.8). * 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`.