update SDL3 from 3.2.20 to 3.4.2

2026-04-01 18:25:03 +02:00
parent 1daf4d79f1
commit 05b19704f8
1626 changed files with 124218 additions and 191491 deletions
@@ -16,13 +16,6 @@ else()
 endif()
 set(HAVE_EXAMPLES_LINK_SHARED "${SDL_EXAMPLES_LINK_SHARED}" PARENT_SCOPE)

-# CMake incorrectly detects opengl32.lib being present on MSVC ARM64
-if(NOT (MSVC AND SDL_CPU_ARM64))
-    # Prefer GLVND, if present
-    set(OpenGL_GL_PREFERENCE GLVND)
-    find_package(OpenGL)
-endif()
-
 set(SDL_EXAMPLE_EXECUTABLES)

 if(CMAKE_RUNTIME_OUTPUT_DIRECTORY)
@@ -38,7 +31,7 @@ if(NOT CMAKE_VERSION VERSION_LESS 3.20)
    set(example_bin_dir "${example_bin_dir}$<$<BOOL:${is_multi_config}>:/$<CONFIG>>")
 endif()

-file(GLOB RESOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/*.bmp ${CMAKE_CURRENT_SOURCE_DIR}/../test/*.wav ${CMAKE_CURRENT_SOURCE_DIR}/../test/*.hex)
+file(GLOB RESOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/*.png ${CMAKE_CURRENT_SOURCE_DIR}/../test/*.wav ${CMAKE_CURRENT_SOURCE_DIR}/../test/*.hex)

 set(RESOURCE_FILE_NAMES)
 set(RESOURCE_FILES_BINDIR)
@@ -64,17 +57,12 @@ macro(add_sdl_example_executable TARGET)
    if(NOT AST_SOURCES)
        message(FATAL_ERROR "add_sdl_example_executable needs at least one source")
    endif()
-    set(EXTRA_SOURCES "")
-    if(AST_DATAFILES)
-        list(APPEND EXTRA_SOURCES ${DATAFILES})
-    endif()
    if(ANDROID)
-        add_library(${TARGET} SHARED ${AST_SOURCES} ${EXTRA_SOURCES})
+        add_library(${TARGET} SHARED ${AST_SOURCES} ${AST_DATAFILES})
    else()
-        add_executable(${TARGET} ${AST_SOURCES} ${EXTRA_SOURCES})
+        add_executable(${TARGET} ${AST_SOURCES} ${AST_DATAFILES})
    endif()
    SDL_AddCommonCompilerFlags(${TARGET})
-    target_include_directories(${TARGET} PRIVATE "${SDL3_SOURCE_DIR}/src/video/khronos")
    target_link_libraries(${TARGET} PRIVATE SDL3::${sdl_name_component})

    list(APPEND SDL_EXAMPLE_EXECUTABLES ${TARGET})
@@ -85,13 +73,9 @@ macro(add_sdl_example_executable TARGET)
                COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${AST_DATAFILES} $<TARGET_FILE_DIR:${TARGET}>/sdl-${TARGET}
                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
            )
-        else()
+        elseif(NOT APPLE AND NOT N3DS)
            add_dependencies(${TARGET} copy-sdl-example-resources)
        endif()
-        if(APPLE)
-            # Make sure resource files get installed into macOS/iOS .app bundles.
-            set_target_properties(${TARGET} PROPERTIES RESOURCE "${AST_DATAFILES}")
-        endif()
        if(EMSCRIPTEN)
            foreach(res IN LISTS AST_DATAFILES)
                get_filename_component(res_name "${res}" NAME)
@@ -101,24 +85,45 @@ macro(add_sdl_example_executable TARGET)
        set_property(TARGET ${TARGET} APPEND PROPERTY ADDITIONAL_CLEAN_FILES "$<TARGET_FILE_DIR:${TARGET}>/$<JOIN:${AST_DATAFILES},$<SEMICOLON>$<TARGET_FILE_DIR:${TARGET}>/>")
    endif()

-    if(WINDOWS)
+    if(APPLE)
+        # Set Apple App ID / Bundle ID.  This is needed to launch apps on some Apple
+        # platforms (iOS, for example).
+        set_target_properties(${TARGET} PROPERTIES
+          RESOURCES "${AST_DATAFILES}"
+          MACOSX_BUNDLE TRUE
+          MACOSX_BUNDLE_GUI_IDENTIFIER "org.libsdl.${TARGET}"
+          MACOSX_BUNDLE_BUNDLE_VERSION "${SDL3_VERSION}"
+          MACOSX_BUNDLE_SHORT_VERSION_STRING "${SDL3_VERSION}"
+        )
+        set_property(SOURCE ${AST_DATAFILES} PROPERTY MACOSX_PACKAGE_LOCATION "Resources")
+    elseif(WINDOWS)
        # CET support was added in VS 16.7
        if(MSVC_VERSION GREATER 1926 AND CMAKE_GENERATOR_PLATFORM MATCHES "Win32|x64")
            set_property(TARGET ${TARGET} APPEND_STRING PROPERTY LINK_FLAGS " -CETCOMPAT")
        endif()
-    elseif(PSP)
-        target_link_libraries(${TARGET} PRIVATE GL)
    elseif(EMSCRIPTEN)
        set_property(TARGET ${TARGET} PROPERTY SUFFIX ".html")
        target_link_options(${TARGET} PRIVATE -sALLOW_MEMORY_GROWTH=1)
+    elseif(N3DS)
+        set(ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/romfs/${TARGET}")
+        file(MAKE_DIRECTORY "${ROMFS_DIR}")
+        file(COPY ${AST_DATAFILES} DESTINATION "${ROMFS_DIR}")
+        ctr_generate_smdh("${TARGET}.smdh"
+            NAME "SDL-${TARGET}"
+            DESCRIPTION "SDL3 example application"
+            AUTHOR "SDL3 Contributors"
+            ICON "${CMAKE_CURRENT_SOURCE_DIR}/../test/n3ds/logo48x48.png"
+        )
+        ctr_create_3dsx(
+            ${TARGET}
+            ROMFS "${ROMFS_DIR}"
+            SMDH "${TARGET}.smdh"
+        )
+    elseif(NGAGE)
+        string(MD5 TARGET_MD5 "${TARGET}")
+        string(SUBSTRING "${TARGET_MD5}" 0 8 TARGET_MD5_8)
+        target_link_options(${TARGET} PRIVATE "SHELL:-s UID3=0x${TARGET_MD5_8}")
    endif()
-
-    if(OPENGL_FOUND)
-        target_compile_definitions(${TARGET} PRIVATE HAVE_OPENGL)
-    endif()
-
-    # FIXME: only add "${SDL3_BINARY_DIR}/include-config-$<LOWER_CASE:$<CONFIG>>" + include paths of external dependencies
-    target_include_directories(${TARGET} PRIVATE "$<TARGET_PROPERTY:SDL3::${sdl_name_component},INCLUDE_DIRECTORIES>")
 endmacro()

 add_sdl_example_executable(renderer-clear SOURCES renderer/01-clear/clear.c)
@@ -126,25 +131,31 @@ add_sdl_example_executable(renderer-primitives SOURCES renderer/02-primitives/pr
 add_sdl_example_executable(renderer-lines SOURCES renderer/03-lines/lines.c)
 add_sdl_example_executable(renderer-points SOURCES renderer/04-points/points.c)
 add_sdl_example_executable(renderer-rectangles SOURCES renderer/05-rectangles/rectangles.c)
-add_sdl_example_executable(renderer-textures SOURCES renderer/06-textures/textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
+add_sdl_example_executable(renderer-textures SOURCES renderer/06-textures/textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
 add_sdl_example_executable(renderer-streaming-textures SOURCES renderer/07-streaming-textures/streaming-textures.c)
-add_sdl_example_executable(renderer-rotating-textures SOURCES renderer/08-rotating-textures/rotating-textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
-add_sdl_example_executable(renderer-scaling-textures SOURCES renderer/09-scaling-textures/scaling-textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
-add_sdl_example_executable(renderer-geometry SOURCES renderer/10-geometry/geometry.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
-add_sdl_example_executable(renderer-color-mods SOURCES renderer/11-color-mods/color-mods.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
-add_sdl_example_executable(renderer-viewport SOURCES renderer/14-viewport/viewport.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
-add_sdl_example_executable(renderer-cliprect SOURCES renderer/15-cliprect/cliprect.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
-add_sdl_example_executable(renderer-read-pixels SOURCES renderer/17-read-pixels/read-pixels.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp)
+add_sdl_example_executable(renderer-rotating-textures SOURCES renderer/08-rotating-textures/rotating-textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
+add_sdl_example_executable(renderer-scaling-textures SOURCES renderer/09-scaling-textures/scaling-textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
+add_sdl_example_executable(renderer-geometry SOURCES renderer/10-geometry/geometry.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
+add_sdl_example_executable(renderer-color-mods SOURCES renderer/11-color-mods/color-mods.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
+add_sdl_example_executable(renderer-viewport SOURCES renderer/14-viewport/viewport.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
+add_sdl_example_executable(renderer-cliprect SOURCES renderer/15-cliprect/cliprect.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
+add_sdl_example_executable(renderer-read-pixels SOURCES renderer/17-read-pixels/read-pixels.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
 add_sdl_example_executable(renderer-debug-text SOURCES renderer/18-debug-text/debug-text.c)
+add_sdl_example_executable(renderer-affine-textures SOURCES renderer/19-affine-textures/affine-textures.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png)
 add_sdl_example_executable(audio-simple-playback SOURCES audio/01-simple-playback/simple-playback.c)
 add_sdl_example_executable(audio-simple-playback-callback SOURCES audio/02-simple-playback-callback/simple-playback-callback.c)
 add_sdl_example_executable(audio-load-wav SOURCES audio/03-load-wav/load-wav.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.wav)
 add_sdl_example_executable(audio-multiple-streams SOURCES audio/04-multiple-streams/multiple-streams.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.wav ${CMAKE_CURRENT_SOURCE_DIR}/../test/sword.wav)
+add_sdl_example_executable(audio-planar-data SOURCES audio/05-planar-data/planar-data.c)
 add_sdl_example_executable(input-joystick-polling SOURCES input/01-joystick-polling/joystick-polling.c)
 add_sdl_example_executable(input-joystick-events SOURCES input/02-joystick-events/joystick-events.c)
+add_sdl_example_executable(input-gamepad-polling SOURCES input/03-gamepad-polling/gamepad-polling.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/gamepad_front.png)
+add_sdl_example_executable(input-gamepad-events SOURCES input/04-gamepad-events/gamepad-events.c)
 add_sdl_example_executable(camera-read-and-draw SOURCES camera/01-read-and-draw/read-and-draw.c)
 add_sdl_example_executable(pen-drawing-lines SOURCES pen/01-drawing-lines/drawing-lines.c)
-add_sdl_example_executable(asyncio-load-bitmaps SOURCES asyncio/01-load-bitmaps/load-bitmaps.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.bmp ${CMAKE_CURRENT_SOURCE_DIR}/../test/gamepad_front.bmp ${CMAKE_CURRENT_SOURCE_DIR}/../test/speaker.bmp ${CMAKE_CURRENT_SOURCE_DIR}/../test/icon2x.bmp)
+add_sdl_example_executable(asyncio-load-bitmaps SOURCES asyncio/01-load-bitmaps/load-bitmaps.c DATAFILES ${CMAKE_CURRENT_SOURCE_DIR}/../test/sample.png ${CMAKE_CURRENT_SOURCE_DIR}/../test/gamepad_front.png ${CMAKE_CURRENT_SOURCE_DIR}/../test/speaker.png ${CMAKE_CURRENT_SOURCE_DIR}/../test/icon2x.png)
+add_sdl_example_executable(misc-power SOURCES misc/01-power/power.c)
+add_sdl_example_executable(misc-clipboard SOURCES misc/02-clipboard/clipboard.c)
 add_sdl_example_executable(demo-snake SOURCES demo/01-snake/snake.c)
 add_sdl_example_executable(demo-woodeneye-008 SOURCES demo/02-woodeneye-008/woodeneye-008.c)
 add_sdl_example_executable(demo-infinite-monkeys SOURCES demo/03-infinite-monkeys/infinite-monkeys.c)
@@ -154,7 +165,7 @@ add_sdl_example_executable(demo-bytepusher SOURCES demo/04-bytepusher/bytepusher
 # - Add a new example in examples/
 # - Run python VisualC/examples/generate.py
 # - Take note of the newly generated .vcxproj files
-# - Modify the .vcxproj files if necessary (adding content such as BMP or WAV files)
+# - Modify the .vcxproj files if necessary (adding content such as PNG or WAV files)
 # - Open VisualC/SDL.sln in Visual Studio or JetBrains Rider
 # - Locate the appropriate folder in the Solution Explorer
 # - Add the newly generated projects: Right click -> Add -> Existing project...
@@ -175,28 +186,6 @@ if(PSP)
    endforeach()
 endif()

-if(N3DS)
-    set(ROMFS_DIR "${CMAKE_CURRENT_BINARY_DIR}/romfs")
-    file(MAKE_DIRECTORY "${ROMFS_DIR}")
-    file(COPY ${RESOURCE_FILES} DESTINATION "${ROMFS_DIR}")
-
-    foreach(APP ${SDL_EXAMPLE_EXECUTABLES})
-        get_target_property(TARGET_BINARY_DIR ${APP} BINARY_DIR)
-        set(SMDH_FILE "${TARGET_BINARY_DIR}/${APP}.smdh")
-        ctr_generate_smdh("${SMDH_FILE}"
-            NAME "SDL-${APP}"
-            DESCRIPTION "SDL3 Test suite"
-            AUTHOR "SDL3 Contributors"
-            ICON "${CMAKE_CURRENT_SOURCE_DIR}/../test/n3ds/logo48x48.png"
-        )
-        ctr_create_3dsx(
-            ${APP}
-            ROMFS "${ROMFS_DIR}"
-            SMDH "${SMDH_FILE}"
-        )
-    endforeach()
-endif()
-
 if(RISCOS)
    set(SDL_EXAMPLE_EXECUTABLES_AIF)
    foreach(APP ${SDL_EXAMPLE_EXECUTABLES})
@@ -211,18 +200,6 @@ if(RISCOS)
    endforeach()
 endif()

-# Set Apple App ID / Bundle ID.  This is needed to launch apps on some Apple
-# platforms (iOS, for example).
-if(APPLE)
-  foreach(CURRENT_TARGET ${SDL_EXAMPLE_EXECUTABLES})
-    set_target_properties("${CURRENT_TARGET}" PROPERTIES
-      MACOSX_BUNDLE_GUI_IDENTIFIER "org.libsdl.${CURRENT_TARGET}"
-      MACOSX_BUNDLE_BUNDLE_VERSION "${SDL3_VERSION}"
-      MACOSX_BUNDLE_SHORT_VERSION_STRING "${SDL3_VERSION}"
-    )
-  endforeach()
-endif()
-
 if(SDL_INSTALL_EXAMPLES)
    if(RISCOS)
        install(