Skip to content

Commit 85bdabf

Browse files
authored
Update SDL2 port to 2.0.22 (#16916)
1 parent af7f969 commit 85bdabf

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

tests/sdl2_mouse.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ int main() {
9292
}
9393

9494
void main_2(void* arg) {
95-
emscripten_run_script("window.simulateMouseEvent(0, 0, -1)");
9695
emscripten_run_script("window.simulateMouseEvent(10, 20, -1)"); // move from 0,0 to 10,20
9796
emscripten_run_script("window.simulateMouseEvent(10, 20, 0)"); // click
9897
emscripten_run_script("window.simulateMouseEvent(10, 20, 0)"); // click some more, but this one should be ignored through PeepEvent

tests/test_other.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ def test_cmake_find_modules(self):
829829
self.run_process(['cmake', '--build', '.'])
830830
output = self.run_js('test_prog.js')
831831
self.assertContained('AL_VERSION: 1.1', output)
832-
self.assertContained('SDL version: 2.0.', output)
832+
self.assertContained('SDL version: 2.', output)
833833

834834
@requires_pkg_config
835835
def test_cmake_find_pkg_config(self):

tools/ports/sdl2.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
import os
77

8-
TAG = '4b8d69a41687e5f6f4b05f7fd9804dd9fcac0347'
9-
HASH = '2d4d577c7584da22306b05a44bc08200460a33cd414fed2dc948e2a86e7b2d1a5cbc13bacadb63618823ba63c210f21c570adbab39f7645bf902196fa91c6b4e'
8+
TAG = '0fcfaf9e9482953ee425cc15b91160b92de3df7f'
9+
HASH = '2891b65bbe34ada80de6c83751b01cd259f877123f0eeb31cbacf8f7bac06b2157e17a2183f58911a9849ab57ca8aba165d5b3058ecd2d7191bfb61c0595807e'
1010
SUBDIR = 'SDL-' + TAG
1111

1212

@@ -28,13 +28,13 @@ def create(final):
2828
ports.install_headers(source_include_path, target='SDL2')
2929

3030
# build
31-
srcs = '''SDL.c SDL_assert.c SDL_dataqueue.c SDL_error.c SDL_hints.c SDL_log.c atomic/SDL_atomic.c
32-
atomic/SDL_spinlock.c audio/SDL_audio.c audio/SDL_audiocvt.c audio/SDL_audiodev.c
31+
srcs = '''SDL.c SDL_assert.c SDL_dataqueue.c SDL_error.c SDL_guid.c SDL_hints.c SDL_list.c SDL_log.c
32+
atomic/SDL_atomic.c atomic/SDL_spinlock.c audio/SDL_audio.c audio/SDL_audiocvt.c audio/SDL_audiodev.c
3333
audio/SDL_audiotypecvt.c audio/SDL_mixer.c audio/SDL_wave.c cpuinfo/SDL_cpuinfo.c
3434
dynapi/SDL_dynapi.c events/SDL_clipboardevents.c events/SDL_displayevents.c events/SDL_dropevents.c
3535
events/SDL_events.c events/SDL_gesture.c events/SDL_keyboard.c events/SDL_mouse.c events/SDL_quit.c
3636
events/SDL_touch.c events/SDL_windowevents.c file/SDL_rwops.c haptic/SDL_haptic.c
37-
joystick/SDL_gamecontroller.c joystick/SDL_joystick.c
37+
joystick/controller_type.c joystick/SDL_gamecontroller.c joystick/SDL_joystick.c
3838
power/SDL_power.c render/SDL_d3dmath.c render/SDL_render.c
3939
render/SDL_yuv_sw.c render/direct3d/SDL_render_d3d.c render/direct3d11/SDL_render_d3d11.c
4040
render/opengl/SDL_render_gl.c render/opengl/SDL_shaders_gl.c render/opengles/SDL_render_gles.c

0 commit comments

Comments
 (0)