From 48fe84a0c3ef73e5704e3d842381075c8d799397 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 21 Aug 2026 22:03:50 -0700 Subject: [PATCH 1/2] Remove explicit `-sUSE_SDL=0` when build sdl2/sdl3 ports. This should have been remove in #18443. --- tools/ports/sdl2.py | 2 +- tools/ports/sdl3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ports/sdl2.py b/tools/ports/sdl2.py index 5a9ad417ad3ea..5d5d561930221 100644 --- a/tools/ports/sdl2.py +++ b/tools/ports/sdl2.py @@ -87,7 +87,7 @@ def create(final): srcs = [os.path.join(src_dir, 'src', s) for s in srcs] # TODO: Remove fwrapv when we update to a version which includes https://github.com/libsdl-org/SDL/pull/12581 - flags = ['-sUSE_SDL=0', '-fwrapv-pointer'] + flags = ['-fwrapv-pointer'] includes = [ports.get_include_dir('SDL2')] if settings.PTHREADS: flags += ['-pthread'] diff --git a/tools/ports/sdl3.py b/tools/ports/sdl3.py index e01f5d0feb934..f052646769590 100644 --- a/tools/ports/sdl3.py +++ b/tools/ports/sdl3.py @@ -106,7 +106,7 @@ def create(final): 'sensor/dummy/*.c', ] - flags = ['-sUSE_SDL=0'] + flags = [] if settings.PTHREADS: glob_patterns.append('thread/pthread/*.c') flags += ['-pthread'] From 5c205378004ff4ca94b5b9fba270a7186db6ac19 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Fri, 21 Aug 2026 22:04:59 -0700 Subject: [PATCH 2/2] Remove `-fwrapv-pointer` from SDL2 build. NFC This should have been removed in #24912. --- tools/ports/sdl2.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/ports/sdl2.py b/tools/ports/sdl2.py index 5d5d561930221..60f1ae174e031 100644 --- a/tools/ports/sdl2.py +++ b/tools/ports/sdl2.py @@ -86,8 +86,7 @@ def create(final): srcs += ['thread/%s/%s' % (thread_backend, s) for s in thread_srcs] srcs = [os.path.join(src_dir, 'src', s) for s in srcs] - # TODO: Remove fwrapv when we update to a version which includes https://github.com/libsdl-org/SDL/pull/12581 - flags = ['-fwrapv-pointer'] + flags = [] includes = [ports.get_include_dir('SDL2')] if settings.PTHREADS: flags += ['-pthread']