Merge pull request #107963 from bruvzg/sdl_nx_fix

Fix SDL threading on macOS/Linux.

Author: akien-mga

drivers/sdl/SCsub

@@ -90,9 +90,6 @@ if env["builtin_sdl"]:
         "stdlib/SDL_string.c",
         "stdlib/SDL_strtokr.c",
         "thread/SDL_thread.c",
-        "thread/generic/SDL_syscond.c",
-        "thread/generic/SDL_sysrwlock.c",
-        "thread/generic/SDL_systhread.c",
         "timer/SDL_timer.c",
     ]
 
@@ -182,6 +179,8 @@ if env["builtin_sdl"]:
             "joystick/windows/SDL_windows_gaming_input.c",
             "joystick/windows/SDL_windowsjoystick.c",
             "joystick/windows/SDL_xinputjoystick.c",
+            "thread/generic/SDL_syscond.c",
+            "thread/generic/SDL_sysrwlock.c",
             "thread/windows/SDL_syscond_cv.c",
             "thread/windows/SDL_sysmutex.c",
             "thread/windows/SDL_sysrwlock_srw.c",

platform/linuxbsd/detect.py

@@ -397,7 +397,7 @@ def configure(env: "SConsEnvironment"):
     if env["sdl"]:
         if env["builtin_sdl"]:
             env.Append(CPPDEFINES=["SDL_ENABLED"])
-        elif os.system("pkg-config --exists fontconfig") == 0:  # 0 means found
+        elif os.system("pkg-config --exists sdl3") == 0:  # 0 means found
             env.ParseConfig("pkg-config sdl3 --cflags --libs")
             env.Append(CPPDEFINES=["SDL_ENABLED"])
         else:

thirdparty/sdl/thread/generic/SDL_systhread.c

@@ -63,8 +63,12 @@ mkdir $target/sensor
 cp -rv sensor/{*.{c,h},dummy} $target/sensor
 
 mkdir $target/thread
-cp -rv thread/{*.{c,h},generic,pthread,windows} $target/thread
-rm -f $target/thread/generic/SDL_{sysmutex*.{c,h},systls.c}
+cp -rv thread/{*.{c,h},pthread,windows} $target/thread
+# Despite being 'generic', syssem.c is included in the Unix driver for macOS,
+# and syscond/sysrwlock are used by the Windows driver.
+# systhread_c.h is included by all these, but we should NOT compile the matching .c file.
+mkdir $target/thread/generic
+cp -v thread/generic/SDL_{syssem.c,{syscond,sysrwlock}*.{c,h},systhread_c.h} $target/thread/generic
 
 mkdir $target/timer
 cp -rv timer/{*.{c,h},unix,windows} $target/timer