Skip to content

Commit

Permalink
Update to SDL v2.30.9
Browse files Browse the repository at this point in the history
  • Loading branch information
bradharding committed Nov 2, 2024
1 parent 2468723 commit fd16372
Show file tree
Hide file tree
Showing 152 changed files with 18 additions and 14 deletions.
1 change: 0 additions & 1 deletion SDL2-2.30.8/.git-hash

This file was deleted.

1 change: 1 addition & 0 deletions SDL2-2.30.9/.git-hash
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c98c4fbff6d8f3016a3ce6685bf8f43433c3efcc
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if(EXISTS "${_sdl2main_library}")
endif()
set(SDL2_SDL2main_FOUND TRUE)
else()
set(SDL2_SDL2_FOUND FALSE)
set(SDL2_SDL2main_FOUND FALSE)
endif()
unset(_sdl2main_library)

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
* frames_ (with stereo output, two samples--left and right--would make a
* single sample frame). This number should be a power of two, and may be
* adjusted by the audio driver to a value more suitable for the hardware.
* Good values seem to range between 512 and 8096 inclusive, depending on
* Good values seem to range between 512 and 4096 inclusive, depending on
* the application and CPU speed. Smaller values reduce latency, but can
* lead to underflow if the application is doing heavy processing and cannot
* fill the audio buffer in time. Note that the number of sample frames is
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ typedef uint64_t Uint64;
#define SDL_PRIs64 "I64d"
#elif defined(PRIs64)
#define SDL_PRIs64 PRIs64
#elif defined(__LP64__) && !defined(__APPLE__)
#elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__)
#define SDL_PRIs64 "ld"
#else
#define SDL_PRIs64 "lld"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ typedef struct SDL_version
*/
#define SDL_MAJOR_VERSION 2
#define SDL_MINOR_VERSION 30
#define SDL_PATCHLEVEL 8
#define SDL_PATCHLEVEL 9

/**
* Macro to determine SDL version program was compiled against.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ extern "C" {
VK_DEFINE_HANDLE(VkInstance)
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)

/* Make sure to undef to avoid issues in case of later vulkan include */
#undef VK_DEFINE_HANDLE
#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE

#endif /* !NO_SDL_VULKAN_TYPEDEFS */

typedef VkInstance SDL_vulkanInstance;
Expand Down
File renamed without changes.
File renamed without changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified msvc/Debug/SDL2.dll
Binary file not shown.
Binary file modified msvc/Release/SDL2.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.30.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\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.8\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\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.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\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.8\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\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.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\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.8\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\lib\x86</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x86;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x86;$(ProjectDir)..\SDL2_image-2.8.2\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.8\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\include</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\src;$(ProjectDir)..\SDL2-2.30.9\include;$(ProjectDir)..\SDL2_mixer-2.8.0\include;$(ProjectDir)..\SDL2_image-2.8.2\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.8\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(ProjectDir)..\SDL2-2.30.9\lib\x64;$(ProjectDir)..\SDL2_mixer-2.8.0\lib\x64;$(ProjectDir)..\SDL2_image-2.8.2\lib\x64</AdditionalLibraryDirectories>
</Link>
<Manifest>
<AdditionalManifestFiles>..\src\doomretro.manifest</AdditionalManifestFiles>
Expand Down
Binary file modified msvc/x64/Debug/SDL2.dll
Binary file not shown.
Binary file modified msvc/x64/Release/SDL2.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

* *DOOM Retro* is now built using v17.11.5 of [*Microsoft Visual Studio Community 2022*](https://visualstudio.microsoft.com/vs/community/).
* *DOOM Retro* now uses [*SDL v2.30.8*](https://github.com/libsdl-org/SDL/releases/tag/release-2.30.8).
* *DOOM Retro* now uses [*SDL v2.30.9*](https://github.com/libsdl-org/SDL/releases/tag/release-2.30.8).
* Several 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.
* Minor improvements have been made to text autocompleted in the console by pressing the <kbd><b>TAB</b></kbd> key.
Expand Down

0 comments on commit fd16372

Please sign in to comment.