Skip to content

Update SDL2 port to 2.0.22 #16916

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

Merged
sbc100 merged 4 commits into from
Jun 9, 2022
Merged

Update SDL2 port to 2.0.22 #16916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c17dd11
Update SDL2 port to 2.0.22
Daft-Freak May 8, 2022
ff948d3
Update for build fix
Daft-Freak Jun 8, 2022
3d546de
Fix SDL2 mouse test again
Daft-Freak Jun 8, 2022
7672b6f
Update test_cmake_find_modules version check
Daft-Freak Jun 9, 2022
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
1 change: 0 additions & 1 deletion tests/sdl2_mouse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ int main() {
}

void main_2(void* arg) {
emscripten_run_script("window.simulateMouseEvent(0, 0, -1)");
emscripten_run_script("window.simulateMouseEvent(10, 20, -1)"); // move from 0,0 to 10,20
emscripten_run_script("window.simulateMouseEvent(10, 20, 0)"); // click
emscripten_run_script("window.simulateMouseEvent(10, 20, 0)"); // click some more, but this one should be ignored through PeepEvent
Expand Down
2 changes: 1 addition & 1 deletion tests/test_other.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ def test_cmake_find_modules(self):
self.run_process(['cmake', '--build', '.'])
output = self.run_js('test_prog.js')
self.assertContained('AL_VERSION: 1.1', output)
self.assertContained('SDL version: 2.0.', output)
self.assertContained('SDL version: 2.', output)

@requires_pkg_config
def test_cmake_find_pkg_config(self):
Expand Down
10 changes: 5 additions & 5 deletions tools/ports/sdl2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import os

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


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

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