Skip to content

Commit 078f403

Browse files
committed
Updated SDL2 to 2.30.10
1 parent 822221f commit 078f403

35 files changed

+31713
-32283
lines changed

Generator/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
.Setup<CsCodeGenerator>("sdl2/generator.json")
4848
.AddPrePatch(new NamingPatch(["SDL"], NamingPatchOptions.None))
4949
.AddPrePatch(new EnumNamePatch())
50-
.Generate(["sdl2/include/main.h"], "../../../../Hexa.NET.SDL2/Generated", [.. Directory.GetFiles("include")])
50+
.Generate(["sdl2/include/main.h"], "../../../../Hexa.NET.SDL2/Generated", [.. Directory.GetFiles("sdl2/include")])
5151

5252
// SDL 3
5353
.Setup<CsCodeGenerator>("sdl3/generator.json")

Generator/sdl2/include/SDL_audio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,7 @@ extern DECLSPEC int SDLCALL SDL_GetDefaultAudioInfo(char **name,
594594
* frames_ (with stereo output, two samples--left and right--would make a
595595
* single sample frame). This number should be a power of two, and may be
596596
* adjusted by the audio driver to a value more suitable for the hardware.
597-
* Good values seem to range between 512 and 8096 inclusive, depending on
597+
* Good values seem to range between 512 and 4096 inclusive, depending on
598598
* the application and CPU speed. Smaller values reduce latency, but can
599599
* lead to underflow if the application is doing heavy processing and cannot
600600
* fill the audio buffer in time. Note that the number of sample frames is

Generator/sdl2/include/SDL_cpuinfo.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ _m_prefetch(void *__P)
5353
#ifndef __MMX__
5454
#define __MMX__
5555
#endif
56+
/*
5657
#ifndef __3dNOW__
5758
#define __3dNOW__
5859
#endif
60+
*/
5961
#endif
6062
#ifndef __SSE__
6163
#define __SSE__

Generator/sdl2/include/SDL_stdinc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,9 @@ typedef uint64_t Uint64;
255255
#ifndef SDL_PRIs64
256256
#if defined(__WIN32__) || defined(__GDK__)
257257
#define SDL_PRIs64 "I64d"
258-
#elif defined(PRIs64)
259-
#define SDL_PRIs64 PRIs64
260-
#elif defined(__LP64__) && !defined(__APPLE__)
258+
#elif defined(PRId64)
259+
#define SDL_PRIs64 PRId64
260+
#elif defined(__LP64__) && !defined(__APPLE__) && !defined(__EMSCRIPTEN__)
261261
#define SDL_PRIs64 "ld"
262262
#else
263263
#define SDL_PRIs64 "lld"

Generator/sdl2/include/SDL_version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ typedef struct SDL_version
5959
*/
6060
#define SDL_MAJOR_VERSION 2
6161
#define SDL_MINOR_VERSION 30
62-
#define SDL_PATCHLEVEL 8
62+
#define SDL_PATCHLEVEL 10
6363

6464
/**
6565
* Macro to determine SDL version program was compiled against.

Generator/sdl2/include/SDL_vulkan.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ extern "C" {
5252
VK_DEFINE_HANDLE(VkInstance)
5353
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
5454

55+
/* Make sure to undef to avoid issues in case of later vulkan include */
56+
#undef VK_DEFINE_HANDLE
57+
#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE
58+
5559
#endif /* !NO_SDL_VULKAN_TYPEDEFS */
5660

5761
typedef VkInstance SDL_vulkanInstance;

Hexa.NET.SDL2/Generated/Constants/Constants.000.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ public unsafe partial class SDL
692692

693693
public const int SDL_MINOR_VERSION = 30;
694694

695-
public const int SDL_PATCHLEVEL = 8;
695+
public const int SDL_PATCHLEVEL = 10;
696696

697697
public const uint SDL_INIT_TIMER = 0x00000001u;
698698

0 commit comments

Comments
 (0)