From c7fdd266748b432820b3aee17e66a10ca4c48683 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Tue, 22 Oct 2024 09:11:15 +0100 Subject: [PATCH 1/3] Update bindings (to illustrate problem) Duplicate `SDL_Sandbox` definitions prevent compiling. --- SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs | 4 +++ SDL3-CS/SDL3/ClangSharp/SDL_gpu.g.cs | 32 +++++++++---------- SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs | 6 ++++ SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs | 7 ++++ .../SDL3/ClangSharp/SDL_system.Android.g.cs | 9 ++++++ SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs | 9 ++++++ SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs | 9 ++++++ .../SDL3/ClangSharp/SDL_system.Windows.g.cs | 9 ++++++ SDL3-CS/SDL3/ClangSharp/SDL_system.g.cs | 12 +++++++ SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs | 9 ++++++ SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs | 3 ++ 11 files changed, 93 insertions(+), 16 deletions(-) diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs index 00d8ad0..5d5c7dc 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_events.g.cs @@ -139,6 +139,10 @@ namespace SDL SDL_EVENT_CAMERA_DEVICE_DENIED, SDL_EVENT_RENDER_TARGETS_RESET = 0x2000, SDL_EVENT_RENDER_DEVICE_RESET, + SDL_EVENT_PRIVATE0 = 0x4000, + SDL_EVENT_PRIVATE1, + SDL_EVENT_PRIVATE2, + SDL_EVENT_PRIVATE3, SDL_EVENT_POLL_SENTINEL = 0x7F00, SDL_EVENT_USER = 0x8000, SDL_EVENT_LAST = 0xFFFF, diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_gpu.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_gpu.g.cs index 7ef9b3a..aff35dd 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_gpu.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_gpu.g.cs @@ -1470,32 +1470,32 @@ namespace SDL [NativeTypeName("#define SDL_PROP_GPU_CREATETEXTURE_D3D12_CLEAR_STENCIL_UINT8 \"SDL.gpu.createtexture.d3d12.clear.stencil\"")] public static ReadOnlySpan SDL_PROP_GPU_CREATETEXTURE_D3D12_CLEAR_STENCIL_UINT8 => "SDL.gpu.createtexture.d3d12.clear.stencil"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL \"SDL.gpu.device.create.debugmode\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOL => "SDL.gpu.device.create.debugmode"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN \"SDL.gpu.device.create.debugmode\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_DEBUGMODE_BOOLEAN => "SDL.gpu.device.create.debugmode"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL \"SDL.gpu.device.create.preferlowpower\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOL => "SDL.gpu.device.create.preferlowpower"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN \"SDL.gpu.device.create.preferlowpower\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_PREFERLOWPOWER_BOOLEAN => "SDL.gpu.device.create.preferlowpower"u8; [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_NAME_STRING \"SDL.gpu.device.create.name\"")] public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_NAME_STRING => "SDL.gpu.device.create.name"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL \"SDL.gpu.device.create.shaders.private\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOL => "SDL.gpu.device.create.shaders.private"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOLEAN \"SDL.gpu.device.create.shaders.private\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_PRIVATE_BOOLEAN => "SDL.gpu.device.create.shaders.private"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL \"SDL.gpu.device.create.shaders.spirv\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOL => "SDL.gpu.device.create.shaders.spirv"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN \"SDL.gpu.device.create.shaders.spirv\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_SPIRV_BOOLEAN => "SDL.gpu.device.create.shaders.spirv"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL \"SDL.gpu.device.create.shaders.dxbc\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOL => "SDL.gpu.device.create.shaders.dxbc"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN \"SDL.gpu.device.create.shaders.dxbc\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXBC_BOOLEAN => "SDL.gpu.device.create.shaders.dxbc"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL \"SDL.gpu.device.create.shaders.dxil\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOL => "SDL.gpu.device.create.shaders.dxil"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN \"SDL.gpu.device.create.shaders.dxil\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_DXIL_BOOLEAN => "SDL.gpu.device.create.shaders.dxil"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL \"SDL.gpu.device.create.shaders.msl\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOL => "SDL.gpu.device.create.shaders.msl"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN \"SDL.gpu.device.create.shaders.msl\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_MSL_BOOLEAN => "SDL.gpu.device.create.shaders.msl"u8; - [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOL \"SDL.gpu.device.create.shaders.metallib\"")] - public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOL => "SDL.gpu.device.create.shaders.metallib"u8; + [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOLEAN \"SDL.gpu.device.create.shaders.metallib\"")] + public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_SHADERS_METALLIB_BOOLEAN => "SDL.gpu.device.create.shaders.metallib"u8; [NativeTypeName("#define SDL_PROP_GPU_DEVICE_CREATE_D3D12_SEMANTIC_NAME_STRING \"SDL.gpu.device.create.d3d12.semantic\"")] public static ReadOnlySpan SDL_PROP_GPU_DEVICE_CREATE_D3D12_SEMANTIC_NAME_STRING => "SDL.gpu.device.create.d3d12.semantic"u8; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs index 2be1f82..6a0e2f4 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs @@ -502,6 +502,9 @@ namespace SDL [NativeTypeName("#define SDL_HINT_OPENGL_ES_DRIVER \"SDL_OPENGL_ES_DRIVER\"")] public static ReadOnlySpan SDL_HINT_OPENGL_ES_DRIVER => "SDL_OPENGL_ES_DRIVER"u8; + [NativeTypeName("#define SDL_HINT_OPENVR_LIBRARY \"SDL_OPENVR_LIBRARY\"")] + public static ReadOnlySpan SDL_HINT_OPENVR_LIBRARY => "SDL_OPENVR_LIBRARY"u8; + [NativeTypeName("#define SDL_HINT_ORIENTATIONS \"SDL_ORIENTATIONS\"")] public static ReadOnlySpan SDL_HINT_ORIENTATIONS => "SDL_ORIENTATIONS"u8; @@ -586,6 +589,9 @@ namespace SDL [NativeTypeName("#define SDL_HINT_VIDEO_ALLOW_SCREENSAVER \"SDL_VIDEO_ALLOW_SCREENSAVER\"")] public static ReadOnlySpan SDL_HINT_VIDEO_ALLOW_SCREENSAVER => "SDL_VIDEO_ALLOW_SCREENSAVER"u8; + [NativeTypeName("#define SDL_HINT_VIDEO_DISPLAY_PRIORITY \"SDL_VIDEO_DISPLAY_PRIORITY\"")] + public static ReadOnlySpan SDL_HINT_VIDEO_DISPLAY_PRIORITY => "SDL_VIDEO_DISPLAY_PRIORITY"u8; + [NativeTypeName("#define SDL_HINT_VIDEO_DOUBLE_BUFFER \"SDL_VIDEO_DOUBLE_BUFFER\"")] public static ReadOnlySpan SDL_HINT_VIDEO_DOUBLE_BUFFER => "SDL_VIDEO_DOUBLE_BUFFER"u8; diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs index 2e66547..3f00a6d 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_render.g.cs @@ -397,6 +397,10 @@ namespace SDL [return: NativeTypeName("bool")] public static extern SDLBool SDL_GetRenderVSync(SDL_Renderer* renderer, int* vsync); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + [return: NativeTypeName("bool")] + public static extern SDLBool SDL_RenderDebugText(SDL_Renderer* renderer, float x, float y, [NativeTypeName("const char *")] byte* str); + [NativeTypeName("#define SDL_SOFTWARE_RENDERER \"software\"")] public static ReadOnlySpan SDL_SOFTWARE_RENDERER => "software"u8; @@ -654,5 +658,8 @@ namespace SDL [NativeTypeName("#define SDL_RENDERER_VSYNC_ADAPTIVE (-1)")] public const int SDL_RENDERER_VSYNC_ADAPTIVE = (-1); + + [NativeTypeName("#define SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE 8")] + public const int SDL_DEBUG_TEXT_FONT_CHARACTER_SIZE = 8; } } diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs index 589c1dc..bb0a852 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs @@ -29,6 +29,15 @@ using System.Runtime.Versioning; namespace SDL { + public enum SDL_Sandbox + { + SDL_SANDBOX_NONE = 0, + SDL_SANDBOX_UNKNOWN_CONTAINER, + SDL_SANDBOX_FLATPAK, + SDL_SANDBOX_SNAP, + SDL_SANDBOX_MACOS, + } + public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs index 7d3d93b..5b6466a 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs @@ -28,6 +28,15 @@ using System.Runtime.Versioning; namespace SDL { + public enum SDL_Sandbox + { + SDL_SANDBOX_NONE = 0, + SDL_SANDBOX_UNKNOWN_CONTAINER, + SDL_SANDBOX_FLATPAK, + SDL_SANDBOX_SNAP, + SDL_SANDBOX_MACOS, + } + public partial struct XTaskQueueObject { } diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs index 00a3ce3..ffc7a41 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs @@ -28,6 +28,15 @@ using System.Runtime.Versioning; namespace SDL { + public enum SDL_Sandbox + { + SDL_SANDBOX_NONE = 0, + SDL_SANDBOX_UNKNOWN_CONTAINER, + SDL_SANDBOX_FLATPAK, + SDL_SANDBOX_SNAP, + SDL_SANDBOX_MACOS, + } + public static partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs index dfac178..0f47345 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs @@ -29,6 +29,15 @@ using System.Runtime.Versioning; namespace SDL { + public enum SDL_Sandbox + { + SDL_SANDBOX_NONE = 0, + SDL_SANDBOX_UNKNOWN_CONTAINER, + SDL_SANDBOX_FLATPAK, + SDL_SANDBOX_SNAP, + SDL_SANDBOX_MACOS, + } + public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.g.cs index 0b88298..e97f4fe 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.g.cs @@ -28,6 +28,15 @@ using System.Runtime.InteropServices; namespace SDL { + public enum SDL_Sandbox + { + SDL_SANDBOX_NONE = 0, + SDL_SANDBOX_UNKNOWN_CONTAINER, + SDL_SANDBOX_FLATPAK, + SDL_SANDBOX_SNAP, + SDL_SANDBOX_MACOS, + } + public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] @@ -41,6 +50,9 @@ namespace SDL [return: NativeTypeName("bool")] public static extern SDLBool SDL_IsTV(); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + public static extern SDL_Sandbox SDL_GetSandbox(); + [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void SDL_OnApplicationWillTerminate(); diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs index 6b5a4c9..4a11bfe 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs @@ -29,6 +29,15 @@ using System.Runtime.Versioning; namespace SDL { + public enum SDL_Sandbox + { + SDL_SANDBOX_NONE = 0, + SDL_SANDBOX_UNKNOWN_CONTAINER, + SDL_SANDBOX_FLATPAK, + SDL_SANDBOX_SNAP, + SDL_SANDBOX_MACOS, + } + public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs index eada179..c8fa8c8 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_video.g.cs @@ -809,6 +809,9 @@ namespace SDL [NativeTypeName("#define SDL_PROP_WINDOW_COCOA_METAL_VIEW_TAG_NUMBER \"SDL.window.cocoa.metal_view_tag\"")] public static ReadOnlySpan SDL_PROP_WINDOW_COCOA_METAL_VIEW_TAG_NUMBER => "SDL.window.cocoa.metal_view_tag"u8; + [NativeTypeName("#define SDL_PROP_WINDOW_OPENVR_OVERLAY_ID \"SDL.window.openvr.overlay_id\"")] + public static ReadOnlySpan SDL_PROP_WINDOW_OPENVR_OVERLAY_ID => "SDL.window.openvr.overlay_id"u8; + [NativeTypeName("#define SDL_PROP_WINDOW_VIVANTE_DISPLAY_POINTER \"SDL.window.vivante.display\"")] public static ReadOnlySpan SDL_PROP_WINDOW_VIVANTE_DISPLAY_POINTER => "SDL.window.vivante.display"u8; From e5a7980b9ec216bb7a0df6eddf9cf7f240493b3f Mon Sep 17 00:00:00 2001 From: Susko3 Date: Tue, 22 Oct 2024 09:20:55 +0100 Subject: [PATCH 2/3] Exclude `enum`s from platform-specific bindgen --- SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs | 9 --------- SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs | 9 --------- SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs | 9 --------- SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs | 9 --------- SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs | 9 --------- SDL3-CS/generate_bindings.py | 14 +++++++------- 6 files changed, 7 insertions(+), 52 deletions(-) diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs index bb0a852..589c1dc 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.Android.g.cs @@ -29,15 +29,6 @@ using System.Runtime.Versioning; namespace SDL { - public enum SDL_Sandbox - { - SDL_SANDBOX_NONE = 0, - SDL_SANDBOX_UNKNOWN_CONTAINER, - SDL_SANDBOX_FLATPAK, - SDL_SANDBOX_SNAP, - SDL_SANDBOX_MACOS, - } - public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs index 5b6466a..7d3d93b 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.GDK.g.cs @@ -28,15 +28,6 @@ using System.Runtime.Versioning; namespace SDL { - public enum SDL_Sandbox - { - SDL_SANDBOX_NONE = 0, - SDL_SANDBOX_UNKNOWN_CONTAINER, - SDL_SANDBOX_FLATPAK, - SDL_SANDBOX_SNAP, - SDL_SANDBOX_MACOS, - } - public partial struct XTaskQueueObject { } diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs index ffc7a41..00a3ce3 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.Linux.g.cs @@ -28,15 +28,6 @@ using System.Runtime.Versioning; namespace SDL { - public enum SDL_Sandbox - { - SDL_SANDBOX_NONE = 0, - SDL_SANDBOX_UNKNOWN_CONTAINER, - SDL_SANDBOX_FLATPAK, - SDL_SANDBOX_SNAP, - SDL_SANDBOX_MACOS, - } - public static partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs index 0f47345..dfac178 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.Windows.g.cs @@ -29,15 +29,6 @@ using System.Runtime.Versioning; namespace SDL { - public enum SDL_Sandbox - { - SDL_SANDBOX_NONE = 0, - SDL_SANDBOX_UNKNOWN_CONTAINER, - SDL_SANDBOX_FLATPAK, - SDL_SANDBOX_SNAP, - SDL_SANDBOX_MACOS, - } - public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs index 4a11bfe..6b5a4c9 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_system.iOS.g.cs @@ -29,15 +29,6 @@ using System.Runtime.Versioning; namespace SDL { - public enum SDL_Sandbox - { - SDL_SANDBOX_NONE = 0, - SDL_SANDBOX_UNKNOWN_CONTAINER, - SDL_SANDBOX_FLATPAK, - SDL_SANDBOX_SNAP, - SDL_SANDBOX_MACOS, - } - public static unsafe partial class SDL3 { [DllImport("SDL3", CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/SDL3-CS/generate_bindings.py b/SDL3-CS/generate_bindings.py index 233a022..862b1c9 100644 --- a/SDL3-CS/generate_bindings.py +++ b/SDL3-CS/generate_bindings.py @@ -289,13 +289,13 @@ def run_clangsharp(command, header: Header): # regex for ClangSharp-generated SDL functions -generated_function_regex = re.compile(r"public static extern \w+\** (SDL_\w+)\(") +generated_symbol_regex = re.compile(r"public (enum|static extern \w+\**) (SDL_\w+)") -def get_generated_functions(file): +def get_generated_symbols(file): with open(file, "r", encoding="utf-8") as f: - for match in generated_function_regex.finditer(f.read()): - yield match.group(1) + for match in generated_symbol_regex.finditer(f.read()): + yield match.group(2) def generate_platform_specific_headers(sdl_api, header: Header, platforms): @@ -303,15 +303,15 @@ def generate_platform_specific_headers(sdl_api, header: Header, platforms): print(f"💠 {header} platform agnostic") platform_agnostic_cs = run_clangsharp(base_command, header) - platform_agnostic_functions = list(get_generated_functions(platform_agnostic_cs)) + platform_agnostic_symbols = list(get_generated_symbols(platform_agnostic_cs)) output_files = [platform_agnostic_cs] for (defines, suffix, platform_name) in platforms: command = base_command + ["--define-macro"] + defines - if platform_agnostic_functions: + if platform_agnostic_symbols: command.append("--exclude") - command.extend(platform_agnostic_functions) + command.extend(platform_agnostic_symbols) if all_functions: command.append("--with-attribute") From 5ab6d58b9e3e9f163f17a44019bb51aa5e2c1f52 Mon Sep 17 00:00:00 2001 From: Susko3 Date: Tue, 22 Oct 2024 09:27:28 +0100 Subject: [PATCH 3/3] Update comment --- SDL3-CS/generate_bindings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL3-CS/generate_bindings.py b/SDL3-CS/generate_bindings.py index 862b1c9..fa06475 100644 --- a/SDL3-CS/generate_bindings.py +++ b/SDL3-CS/generate_bindings.py @@ -288,7 +288,7 @@ def run_clangsharp(command, header: Header): return header.output_file() -# regex for ClangSharp-generated SDL functions +# regex for ClangSharp-generated SDL functions and enums generated_symbol_regex = re.compile(r"public (enum|static extern \w+\**) (SDL_\w+)")