diff --git a/meson.build b/meson.build index 27cefa4c9c..042742aa07 100644 --- a/meson.build +++ b/meson.build @@ -86,6 +86,7 @@ sdl_image = '@0@_image'.format(sdl) if sdl_api == 3 add_global_arguments('-DPG_SDL3=1', language: 'c') + add_global_arguments('-DSDL_ENABLE_OLD_NAMES=1', language: 'c') endif pg_inc_dirs = [] diff --git a/src_c/bufferproxy.c b/src_c/bufferproxy.c index 318e0ad0f4..1c41fa0813 100644 --- a/src_c/bufferproxy.c +++ b/src_c/bufferproxy.c @@ -34,6 +34,7 @@ #include "pgcompat.h" #include "pgbufferproxy.h" #include "doc/bufferproxy_doc.h" +#include #if SDL_BYTEORDER == SDL_LIL_ENDIAN #define BUFPROXY_MY_ENDIAN '<' diff --git a/src_c/geometry.h b/src_c/geometry.h index aa9cae6ca1..9d13f9fdae 100644 --- a/src_c/geometry.h +++ b/src_c/geometry.h @@ -3,6 +3,7 @@ #include "pygame.h" #include "pgcompat.h" +#include typedef struct { double x, y, r; diff --git a/src_c/meson.build b/src_c/meson.build index 70286af44e..9804e7cdfe 100644 --- a/src_c/meson.build +++ b/src_c/meson.build @@ -84,8 +84,6 @@ mouse = py.extension_module( ) endif -# TODO: support SDL3 -if sdl_api != 3 rect = py.extension_module( 'rect', ['rect.c', 'pgcompat_rect.c'], @@ -94,7 +92,6 @@ rect = py.extension_module( install: true, subdir: pg, ) -endif # TODO: support SDL3 if sdl_api != 3 @@ -275,8 +272,6 @@ mask = py.extension_module( ) endif -# TODO: support SDL3 -if sdl_api != 3 bufferproxy = py.extension_module( 'bufferproxy', 'bufferproxy.c', @@ -285,7 +280,6 @@ bufferproxy = py.extension_module( install: true, subdir: pg, ) -endif # TODO: support SDL3 if sdl_api != 3 @@ -299,8 +293,6 @@ pixelarray = py.extension_module( ) endif -# TODO: support SDL3 -if sdl_api != 3 math = py.extension_module( 'math', 'math.c', @@ -309,7 +301,6 @@ math = py.extension_module( install: true, subdir: pg, ) -endif # TODO: support SDL3 if sdl_api != 3 @@ -323,8 +314,6 @@ pixelcopy = py.extension_module( ) endif -# TODO: support SDL3 -if sdl_api != 3 newbuffer = py.extension_module( 'newbuffer', 'newbuffer.c', @@ -333,7 +322,6 @@ newbuffer = py.extension_module( install: true, subdir: pg, ) -endif # new/experimental/uncommon stuff, but built by default # TODO: support SDL3 @@ -348,8 +336,6 @@ system = py.extension_module( ) endif -# TODO: support SDL3 -if sdl_api != 3 geometry = py.extension_module( 'geometry', 'geometry.c', @@ -358,7 +344,6 @@ geometry = py.extension_module( install: true, subdir: pg, ) -endif # TODO: support SDL3 if sdl_api != 3