Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SDL2 to 2.30.12 #1901

Closed
wants to merge 1 commit into from
+25 −6
Closed

Update SDL2 to 2.30.12 #1901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project/lib/custom/sdl/include/SDL_config_macosx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
#define SDL_VIDEO_OPENGL_ES2 1
#endif
#ifndef SDL_VIDEO_OPENGL_EGL
#define SDL_VIDEO_OPENGL_EGL 0
#define SDL_VIDEO_OPENGL_EGL 1
#endif
#ifndef SDL_VIDEO_OPENGL_CGL
#define SDL_VIDEO_OPENGL_CGL 1
Expand Down
2 changes: 1 addition & 1 deletion project/lib/sdl
Open in desktop
Submodule sdl updated 1402 files
25 changes: 22 additions & 3 deletions project/lib/sdl-files.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/sdl/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/hidapi/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/src/video/khronos/" />
<compilerflag value="-I${SDL_CONFIG_PATH}" if="SDL_CONFIG_PATH" />

<compilerflag value="-DGL_GLEXT_PROTOTYPES" if="android || rpi" />
Expand Down Expand Up @@ -127,6 +128,7 @@

<section if="linux">

<compilerflag value="-DHAVE_LINUX_INPUT_H" />
<compilerflag value="-DHAVE_LINUX_VERSION_H" />
<compilerflag value="-D_REENTRANT" />
<compilerflag value="-mmmx" unless="rpi" />
Expand Down Expand Up @@ -196,12 +198,16 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_quit.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_touch.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_windowevents.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_scancode_tables.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/events/SDL_keysym_to_scancode.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/file/SDL_rwops.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/SDL_haptic.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/hidapi/SDL_hidapi.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/controller_type.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_gamecontroller.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_joystick.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/steam/SDL_steamcontroller.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/SDL_steam_virtual_gamepad.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/virtual/SDL_virtualjoystick.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_atan2.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/libm/e_exp.c" />
Expand Down Expand Up @@ -245,9 +251,12 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_hints.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_list.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_log.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_utils.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL_guid.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/SDL.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/dummy/SDL_dummysensor.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/sensor/SDL_sensor.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc16.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_crc32.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_getenv.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/stdlib/SDL_iconv.c" />
Expand Down Expand Up @@ -281,7 +290,9 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_video.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_vulkan_utils.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/SDL_yuv.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_std.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_sse.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/yuv2rgb/yuv_rgb_lsx.c" />

<section unless="windows">

Expand All @@ -294,7 +305,7 @@

</section>

<section if="android || ios || windows || rpi || tvos">
<section if="android || ios || windows || rpi || tvos || mac">

<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles/SDL_render_gles.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/opengles2/SDL_render_gles2.c" />
Expand All @@ -307,6 +318,7 @@

<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_gamecube.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_luna.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps3.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps4.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_ps5.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_rumble.c" />
Expand All @@ -316,6 +328,10 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xbox360w.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_xboxone.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_shield.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_combined.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_wii.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapi_steamdeck.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/hidapi/SDL_hidapijoystick.c" />

</section>
Expand Down Expand Up @@ -455,6 +471,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/audio/winmm/SDL_winmm.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_windows.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_xinput.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/core/windows/SDL_immdevice.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_dinputhaptic.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_windowshaptic.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/haptic/windows/SDL_xinputhaptic.c" />
Expand All @@ -464,6 +481,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/joystick/windows/SDL_xinputjoystick.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/loadso/windows/SDL_sysloadso.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d12/SDL_render_d3d12.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/SDL_d3dmath.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/generic/SDL_syscond.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/thread/windows/SDL_sysmutex.c" />
Expand Down Expand Up @@ -509,6 +527,7 @@
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/misc/winrt/SDL_sysurl.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/power/winrt/SDL_syspower.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_d3d11.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d12/SDL_render_d3d12.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_render_winrt.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/render/direct3d11/SDL_shaders_d3d11.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/winrt/SDL_winrtevents.cpp" />
Expand Down
2 changes: 1 addition & 1 deletion project/src/graphics/opengl/OpenGL.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
#include <gl/GL.h>
#endif

typedef ptrdiff_t GLsizeiptrARB;
// typedef ptrdiff_t GLsizeiptrARB;
#define NEED_EXTENSIONS
#define DYNAMIC_OGL

Expand Down