From 63f3c1781cec32bd4603cd92a9b788e3000a9594 Mon Sep 17 00:00:00 2001 From: jussi Date: Wed, 12 Mar 2025 23:26:01 +0200 Subject: Basic sdl3 support. --- include/main.h | 6 ++++-- include/platforms/core_desktop_sdl.h | 12 ------------ include/platforms/core_desktop_sdl2.h | 12 ++++++++++++ include/platforms/core_desktop_sdl3.h | 3 +++ include/state.h | 4 ++-- 5 files changed, 21 insertions(+), 16 deletions(-) delete mode 100644 include/platforms/core_desktop_sdl.h create mode 100644 include/platforms/core_desktop_sdl2.h create mode 100644 include/platforms/core_desktop_sdl3.h (limited to 'include') diff --git a/include/main.h b/include/main.h index 6fcda26..1d4fc74 100644 --- a/include/main.h +++ b/include/main.h @@ -17,8 +17,10 @@ #ifdef PLATFORM_DESKTOP #include "GLFW/glfw3.h" #include "GLFW/glfw3native.h" -#elif PLATFORM_DESKTOP_SDL - #include +#elif PLATFORM_DESKTOP_SDL2 + #include +#elif PLATFORM_DESKTOP_SDL3 + #include #endif #ifdef SHARED diff --git a/include/platforms/core_desktop_sdl.h b/include/platforms/core_desktop_sdl.h deleted file mode 100644 index e787494..0000000 --- a/include/platforms/core_desktop_sdl.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -// #define SDL_EVENT_QUEUE_LEN 128 - -#include "SDL.h" - -// typedef struct { -// int SDL_eventQueueLen; -// SDL_Event** SDL_eventQueue; -// } SDL_State; - -// extern SDL_State *SDL_state; diff --git a/include/platforms/core_desktop_sdl2.h b/include/platforms/core_desktop_sdl2.h new file mode 100644 index 0000000..e787494 --- /dev/null +++ b/include/platforms/core_desktop_sdl2.h @@ -0,0 +1,12 @@ +#pragma once + +// #define SDL_EVENT_QUEUE_LEN 128 + +#include "SDL.h" + +// typedef struct { +// int SDL_eventQueueLen; +// SDL_Event** SDL_eventQueue; +// } SDL_State; + +// extern SDL_State *SDL_state; diff --git a/include/platforms/core_desktop_sdl3.h b/include/platforms/core_desktop_sdl3.h new file mode 100644 index 0000000..4331412 --- /dev/null +++ b/include/platforms/core_desktop_sdl3.h @@ -0,0 +1,3 @@ +#pragma once + +#include "SDL3/SDL.h" diff --git a/include/state.h b/include/state.h index 1e84b43..a6b5118 100644 --- a/include/state.h +++ b/include/state.h @@ -1,6 +1,6 @@ #pragma once -#ifdef PLATFORM_DESKTOP_SDL +#ifdef PLATFORM_DESKTOP_SDL2 #define PLATFORM_SDL_EVENT_QUEUE_LEN 128 #endif @@ -39,7 +39,7 @@ typedef struct { GLFWpentabletdatafun glfwTabletDataCallback; GLFWpentabletcursorfun glfwTabletCursorCallback; GLFWpentabletproximityfun glfwTabletProximityCallback; -#elif PLATFORM_DESKTOP_SDL +#elif PLATFORM_DESKTOP_SDL2 int SDL_eventQueueLen; SDL_Event* SDL_eventQueue; #endif -- cgit v1.2.3