Updated to version 3.2.28 for release

quit: don't call signal() if we're using sigaction()
At best, this is a no-op. At worst, it might: - Clobber a signal handler someone registered after us - Overwrite the signal mask or flags - Cause unregistration to fail (sigaction() isn't guaranteed to return the exact pointer passed to signal()) (cherry picked from commit 6d99204a82)
2026-07-17 06:21:11 +00:00 · 2025-12-02 07:47:05 -08:00 · 2025-12-01 19:47:32 -06:00 · 2025-11-30 11:37:34 -08:00 · 2025-11-28 07:42:09 -08:00 · 2025-11-26 17:25:50 +03:00
1072 changed files with 188875 additions and 119682 deletions
--- a/.github/actions/setup-ngage-sdk/action.yml
+++ b/.github/actions/setup-ngage-sdk/action.yml
@@ -1,102 +0,0 @@
 name: 'Setup Nonka N-Gage SDK'
 description: 'Download and setup Nokia N-Gage SDK'
 inputs:
  path:
    description: 'Installation path'
    default: 'default'
 runs:
  using: 'composite'
  steps:
    - uses: actions/setup-python@v5
      with:
        python-version: '3.x'
    - name: 'Verify platform'
      id: calc
      shell: sh
      run: |
        case "${{ runner.os }}-${{ runner.arch }}" in
          "Windows-X86" | "Windows-X64")
            echo "ok!"
            echo "cache-key=ngage-sdk-windows" >> ${GITHUB_OUTPUT}
            default_install_path="C:/ngagesdk"
            ;;
          *)
            echo "Unsupported ${{ runner.os }}-${{ runner.arch }}"
            exit 1;
            ;;
        esac
        install_path="${{ inputs.path }}"
        if [ "x$install_path" = "xdefault" ]; then
          install_path="$default_install_path"
        fi
        echo "install-path=$install_path" >> ${GITHUB_OUTPUT}
        toolchain_repo="https://github.com/ngagesdk/ngage-toolchain"
        toolchain_branch="main"
        echo "toolchain-repo=${toolchain_repo}"     >> ${GITHUB_OUTPUT}
        echo "toolchain-branch=${toolchain_branch}" >> ${GITHUB_OUTPUT}
        sdk_repo="https://github.com/ngagesdk/sdk"
        sdk_branch="main"
        echo "sdk-repo=${sdk_repo}"       >> ${GITHUB_OUTPUT}
        echo "sdk-branch=${sdk_branch}"   >> ${GITHUB_OUTPUT}
        tools_repo="https://github.com/ngagesdk/tools"
        tools_branch="main"
        echo "tools-repo=${tools_repo}"       >> ${GITHUB_OUTPUT}
        echo "tools-branch=${tools_branch}"   >> ${GITHUB_OUTPUT}
        extras_repo="https://github.com/ngagesdk/extras"
        extras_branch="main"
        echo "extras-repo=${extras_repo}"       >> ${GITHUB_OUTPUT}
        echo "extras-branch=${extras_branch}"   >> ${GITHUB_OUTPUT}
 #    - name: 'Restore cached ${{ steps.calc.outputs.archive }}'
 #      id: cache-restore
 #      uses: actions/cache/restore@v4
 #      with:
 #        path: '${{ runner.temp }}'
 #        key: ${{ steps.calc.outputs.cache-key }}
    - name: 'Download N-Gage SDK'
 #      if: ${{ !steps.cache-restore.outputs.cache-hit || steps.cache-restore.outputs.cache-hit == 'false' }}
      shell: pwsh
      run: |
        Invoke-WebRequest "${{ steps.calc.outputs.toolchain-repo }}/archive/refs/heads/${{ steps.calc.outputs.toolchain-branch }}.zip"  -OutFile "${{ runner.temp }}/ngage-toolchain.zip"
        Invoke-WebRequest "${{ steps.calc.outputs.sdk-repo }}/archive/refs/heads/${{ steps.calc.outputs.sdk-branch }}.zip"              -OutFile "${{ runner.temp }}/sdk.zip"
        Invoke-WebRequest "${{ steps.calc.outputs.tools-repo }}/archive/refs/heads/${{ steps.calc.outputs.tools-branch }}.zip"          -OutFile "${{ runner.temp }}/tools.zip"
        Invoke-WebRequest "${{ steps.calc.outputs.extras-repo }}/archive/refs/heads/${{ steps.calc.outputs.extras-branch }}.zip"        -OutFile "${{ runner.temp }}/extras.zip"
 #    - name: 'Cache ${{ steps.calc.outputs.archive }}'
 #      if: ${{ !steps.cache-restore.outputs.cache-hit || steps.cache-restore.outputs.cache-hit == 'false' }}
 #      uses: actions/cache/save@v4
 #      with:
 #        path: |
 #          ${{ runner.temp }}/apps.zip
 #          ${{ runner.temp }}/sdk.zip
 #          ${{ runner.temp }}/tools.zip
 #        key: ${{ steps.calc.outputs.cache-key }}
    - name: 'Extract N-Gage SDK'
      shell: pwsh
      run: |
        New-Item -ItemType Directory -Path "${{ steps.calc.outputs.install-path }}" -Force
        New-Item -ItemType Directory -Path "${{ runner.temp }}/ngage-toolchain-temp" -Force 
        7z "-o${{ runner.temp }}/ngage-toolchain-temp"      x "${{ runner.temp }}/ngage-toolchain.zip"
        Move-Item -Path "${{ runner.temp }}/ngage-toolchain-temp/ngage-toolchain-${{ steps.calc.outputs.toolchain-branch }}/*" -Destination "${{ steps.calc.outputs.install-path }}"
        7z "-o${{ steps.calc.outputs.install-path }}/sdk"   x "${{ runner.temp }}/sdk.zip"
        Move-Item -Path "${{ steps.calc.outputs.install-path }}/sdk/sdk-${{ steps.calc.outputs.sdk-branch }}"       -Destination "${{ steps.calc.outputs.install-path }}/sdk/sdk"
        7z "-o${{ steps.calc.outputs.install-path }}/sdk"   x "${{ runner.temp }}/tools.zip"
        Move-Item -Path "${{ steps.calc.outputs.install-path }}/sdk/tools-${{ steps.calc.outputs.tools-branch }}"   -Destination "${{ steps.calc.outputs.install-path }}/sdk/tools"
        7z "-o${{ steps.calc.outputs.install-path }}/sdk"   x "${{ runner.temp }}/extras.zip"
        Move-Item -Path "${{ steps.calc.outputs.install-path }}/sdk/extras-${{ steps.calc.outputs.extras-branch }}" -Destination "${{ steps.calc.outputs.install-path }}/sdk/extras"
    - name: 'Set output variables'
      id: final
      shell: sh
      run: |
        echo "${{ steps.calc.outputs.install-path }}/sdk/sdk/6.1/Shared/EPOC32/gcc/bin" >> $GITHUB_PATH
        echo "${{ steps.calc.outputs.install-path }}/sdk/sdk/6.1/Shared/EPOC32/ngagesdk/bin" >> $GITHUB_PATH
        echo "NGAGESDK=${{ steps.calc.outputs.install-path }}" >> $GITHUB_ENV
        echo "CMAKE_TOOLCHAIN_FILE=${{ steps.calc.outputs.install-path }}/cmake/ngage-toolchain.cmake" >> $GITHUB_ENV
--- a/.github/workflows/create-test-plan.py
+++ b/.github/workflows/create-test-plan.py
@@ -56,7 +56,6 @@ class SdlPlatform(Enum):
    FreeBSD = "freebsd"
    NetBSD = "netbsd"
    OpenBSD = "openbsd"
    NGage = "ngage"
 class Msys2Platform(Enum):
@@ -100,7 +99,6 @@ class JobSpec:
    clang_cl: bool = False
    gdk: bool = False
    vita_gles: Optional[VitaGLES] = None
    more_hard_deps: bool = False
 JOB_SPECS = {
@@ -115,15 +113,12 @@ JOB_SPECS = {
    "msvc-arm64": JobSpec(name="Windows (MSVC, ARM64)",                     os=JobOs.WindowsLatest,     platform=SdlPlatform.Msvc,        artifact="SDL-VC-arm64",           msvc_arch=MsvcArch.Arm64, ),
    "msvc-gdk-x64": JobSpec(name="GDK (MSVC, x64)",                         os=JobOs.WindowsLatest,     platform=SdlPlatform.Msvc,        artifact="SDL-VC-GDK",             msvc_arch=MsvcArch.X64,   msvc_project="VisualC-GDK/SDL.sln", gdk=True, no_cmake=True, ),
    "ubuntu-22.04": JobSpec(name="Ubuntu 22.04",                            os=JobOs.Ubuntu22_04,       platform=SdlPlatform.Linux,       artifact="SDL-ubuntu22.04", ),
    "ubuntu-latest": JobSpec(name="Ubuntu (latest)",                        os=JobOs.UbuntuLatest,      platform=SdlPlatform.Linux,       artifact="SDL-ubuntu-latest", ),
    "ubuntu-24.04-arm64": JobSpec(name="Ubuntu 24.04 (ARM64)",              os=JobOs.Ubuntu24_04_arm,   platform=SdlPlatform.Linux,       artifact="SDL-ubuntu24.04-arm64", ),
-    "steamrt3": JobSpec(name="Steam Linux Runtime 3.0 (x86_64)",            os=JobOs.UbuntuLatest,      platform=SdlPlatform.Linux,       artifact="SDL-steamrt3",           container="registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest", more_hard_deps = True, ),
+    "steamrt-sniper": JobSpec(name="Steam Linux Runtime (Sniper)",          os=JobOs.UbuntuLatest,      platform=SdlPlatform.Linux,       artifact="SDL-slrsniper",          container="registry.gitlab.steamos.cloud/steamrt/sniper/sdk:beta", ),
    "steamrt3-arm64": JobSpec(name="Steam Linux Runtime 3.0 (arm64)",       os=JobOs.Ubuntu24_04_arm,   platform=SdlPlatform.Linux,       artifact="SDL-steamrt3-arm64",     container="registry.gitlab.steamos.cloud/steamrt/sniper/sdk/arm64:latest", more_hard_deps = True, ),
    "ubuntu-intel-icx": JobSpec(name="Ubuntu 22.04 (Intel oneAPI)",         os=JobOs.Ubuntu22_04,       platform=SdlPlatform.Linux,       artifact="SDL-ubuntu22.04-oneapi", intel=IntelCompiler.Icx, ),
    "ubuntu-intel-icc": JobSpec(name="Ubuntu 22.04 (Intel Compiler)",       os=JobOs.Ubuntu22_04,       platform=SdlPlatform.Linux,       artifact="SDL-ubuntu22.04-icc",    intel=IntelCompiler.Icc, ),
    "macos-framework-x64":  JobSpec(name="MacOS (Framework) (x64)",         os=JobOs.Macos14,           platform=SdlPlatform.MacOS,       artifact="SDL-macos-framework",    apple_framework=True,  apple_archs={AppleArch.Aarch64, AppleArch.X86_64, }, xcode=True, ),
    "macos-framework-arm64": JobSpec(name="MacOS (Framework) (arm64)",      os=JobOs.MacosLatest,       platform=SdlPlatform.MacOS,       artifact=None,                     apple_framework=True,  apple_archs={AppleArch.Aarch64, AppleArch.X86_64, }, ),
    "macos-26-framework-arm64": JobSpec(name="MacOS 26 (Framework) (arm64)",os=JobOs.Macos26,           platform=SdlPlatform.MacOS,       artifact=None,                     apple_framework=True,  apple_archs={AppleArch.Aarch64, AppleArch.X86_64, }, ),
    "macos-gnu-arm64": JobSpec(name="MacOS (GNU prefix)",                   os=JobOs.MacosLatest,       platform=SdlPlatform.MacOS,       artifact="SDL-macos-arm64-gnu",    apple_framework=False, apple_archs={AppleArch.Aarch64, },  ),
    "ios": JobSpec(name="iOS (CMake & xcode)",                              os=JobOs.MacosLatest,       platform=SdlPlatform.Ios,         artifact="SDL-ios-arm64",          xcode=True, ),
    "tvos": JobSpec(name="tvOS (CMake & xcode)",                            os=JobOs.MacosLatest,       platform=SdlPlatform.Tvos,        artifact="SDL-tvos-arm64",         xcode=True, ),
@@ -145,12 +140,11 @@ JOB_SPECS = {
    "netbsd": JobSpec(name="NetBSD",                                        os=JobOs.UbuntuLatest,      platform=SdlPlatform.NetBSD,      artifact="SDL-netbsd-x64", ),
    "openbsd": JobSpec(name="OpenBSD",                                      os=JobOs.UbuntuLatest,      platform=SdlPlatform.OpenBSD,     artifact="SDL-openbsd-x64", ),
    "freebsd": JobSpec(name="FreeBSD",                                      os=JobOs.UbuntuLatest,      platform=SdlPlatform.FreeBSD,     artifact="SDL-freebsd-x64", ),
    "ngage": JobSpec(name="N-Gage",                                         os=JobOs.WindowsLatest,     platform=SdlPlatform.NGage,       artifact="SDL-ngage", ),
 }
 class StaticLibType(Enum):
-    STATIC_LIB = "SDL3-static.lib"
+    MSVC = "SDL3-static.lib"
    A = "libSDL3.a"
@@ -231,7 +225,6 @@ class JobDetails:
    check_sources: bool = False
    setup_python: bool = False
    pypi_packages: list[str] = dataclasses.field(default_factory=list)
    setup_gage_sdk_path: str = ""
    binutils_strings: str = "strings"
    def to_workflow(self, enable_artifacts: bool) -> dict[str, str|bool]:
@@ -301,7 +294,6 @@ class JobDetails:
            "check-sources": self.check_sources,
            "setup-python": self.setup_python,
            "pypi-packages": my_shlex_join(self.pypi_packages),
            "setup-ngage-sdk-path": self.setup_gage_sdk_path,
            "binutils-strings": self.binutils_strings,
        }
        return {k: v for k, v in data.items() if v != ""}
@@ -378,7 +370,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
            job.msvc_project_flags.append("-p:TreatWarningsAsError=true")
            job.test_pkg_config = False
            job.shared_lib = SharedLibType.WIN32
-            job.static_lib = StaticLibType.STATIC_LIB
+            job.static_lib = StaticLibType.MSVC
            job.cmake_arguments.extend((
                "-DCMAKE_MSVC_DEBUG_INFORMATION_FORMAT=ProgramDatabase",
                "-DCMAKE_EXE_LINKER_FLAGS=-DEBUG",
@@ -395,11 +387,9 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                match spec.msvc_arch:
                    case MsvcArch.X86:
                        job.cflags.append("/clang:-m32")
                        job.cxxflags.append("/clang:-m32")
                        job.ldflags.append("/MACHINE:X86")
                    case MsvcArch.X64:
                        job.cflags.append("/clang:-m64")
                        job.cxxflags.append("/clang:-m64")
                        job.ldflags.append("/MACHINE:X64")
                    case _:
                        raise ValueError(f"Unsupported clang-cl architecture (arch={spec.msvc_arch})")
@@ -449,7 +439,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                    "libxfixes-dev",
                    "libxi-dev",
                    "libxss-dev",
                    "libxtst-dev",
                    "libwayland-dev",
                    "libxkbcommon-dev",
                    "libdrm-dev",
@@ -461,19 +450,10 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                    "libibus-1.0-dev",
                    "libudev-dev",
                    "fcitx-libs-dev",
                    "libfribidi-dev",
                    # testffmpeg
                    "libavcodec-dev",
                    "libavfilter-dev",
                    "libavutil-dev",
                    "libswresample-dev",
                    "libswscale-dev",
                ))
-                match = re.match(r"ubuntu-(?P<year>[0-9]+)\.(?P<month>[0-9]+|latest).*", spec.os.value)
+                match = re.match(r"ubuntu-(?P<year>[0-9]+)\.(?P<month>[0-9]+).*", spec.os.value)
-                ubuntu_ge_22 = True
+                ubuntu_year, ubuntu_month = [int(match["year"]), int(match["month"])]
-                if match and match["month"] != "latest":
+                if ubuntu_year >= 22:
                    ubuntu_year, ubuntu_month = [int(match["year"]), int(match["month"])]
                    ubuntu_ge_22 = ubuntu_year >= 22
                    job.apt_packages.extend(("libpipewire-0.3-dev", "libdecor-0-dev"))
                job.apt_packages.extend((
                    "libunwind-dev",  # For SDL_test memory tracking
@@ -485,19 +465,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
            job.shared_lib = SharedLibType.SO_0
            job.static_lib = StaticLibType.A
            fpic = True
            if spec.more_hard_deps:
                # Some distros prefer to make important dependencies
                # mandatory, so that SDL won't start up but lack expected
                # functionality if they're missing
                job.cmake_arguments.extend([
                    "-DSDL_ALSA_SHARED=OFF",
                    "-DSDL_FRIBIDI_SHARED=OFF",
                    "-DSDL_HIDAPI_LIBUSB_SHARED=OFF",
                    "-DSDL_PULSEAUDIO_SHARED=OFF",
                    "-DSDL_X11_SHARED=OFF",
                    "-DSDL_WAYLAND_LIBDECOR_SHARED=OFF",
                    "-DSDL_WAYLAND_SHARED=OFF",
                ])
        case SdlPlatform.Ios | SdlPlatform.Tvos:
            job.brew_packages.extend([
                "ccache",
@@ -544,10 +511,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                    "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13",
                    "-DCLANG_TIDY_BINARY=$(brew --prefix llvm)/bin/clang-tidy",
                ))
                job.brew_packages.extend((
                    # Brew provides a single architecture (aarch64), so it's not usable for fat libraries
                    "ffmpeg",  # testffmpeg
                ))
                job.shared_lib = SharedLibType.DYLIB
                job.static_lib = StaticLibType.A
            job.ccache = True
@@ -686,7 +649,7 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
            job.cmake_arguments.extend((
                f"-DCMAKE_C_COMPILER={job.cc}",
                f"-DCMAKE_CXX_COMPILER={job.cxx}",
-                "-DCMAKE_SYSTEM_NAME=Haiku",
+                "-DSDL_UNIX_CONSOLE_BUILD=ON",
            ))
            job.shared_lib = SharedLibType.SO_0
            job.static_lib = StaticLibType.A
@@ -790,19 +753,6 @@ def spec_to_job(spec: JobSpec, key: str, trackmem_symbol_names: bool) -> JobDeta
                    job.cpactions_arch = "x86-64"
                    job.cpactions_setup_cmd = "sudo pkg_add -u"
                    job.cpactions_install_cmd = "sudo pkg_add cmake ninja pkgconf wayland wayland-protocols libxkbcommon libinotify pulseaudio dbus ibus"
        case SdlPlatform.NGage:
            build_parallel = False
            job.cmake_build_type = "Release"
            job.setup_ninja = True
            job.static_lib = StaticLibType.STATIC_LIB
            job.shared_lib = None
            job.clang_tidy = False
            job.werror = False  # FIXME: enable SDL_WERROR
            job.shared = False
            job.run_tests = False
            job.setup_gage_sdk_path = "C:/ngagesdk"
            job.cmake_toolchain_file = "C:/ngagesdk/cmake/ngage-toolchain.cmake"
            job.test_pkg_config = False
        case _:
            raise ValueError(f"Unsupported platform={spec.platform}")
--- a/.github/workflows/generic.yml
+++ b/.github/workflows/generic.yml
@@ -30,7 +30,6 @@ jobs:
          install: >-
            ${{ matrix.platform.msys2-env }}-cc
            ${{ matrix.platform.msys2-env }}-cmake
            ${{ matrix.platform.msys2-env }}-ffmpeg
            ${{ matrix.platform.msys2-env }}-ninja
            ${{ (!matrix.platform.msys2-no-perl && format('{0}-perl', matrix.platform.msys2-env)) || '' }}
            ${{ matrix.platform.msys2-env }}-pkg-config
@@ -94,11 +93,6 @@ jobs:
        with:
          arch: ${{ matrix.platform.msvc-vcvars-arch }}
          sdk: ${{ matrix.platform.msvc-vcvars-sdk }}
      - name: 'Set up Nokia N-Gage SDK'
        uses: ./.github/actions/setup-ngage-sdk
        if: ${{ matrix.platform.setup-ngage-sdk-path != '' }}
        with:
          path: '${{ matrix.platform.setup-ngage-sdk-path }}'
      - name: 'Set up Windows GDK Desktop'
        uses: ./.github/actions/setup-gdk-desktop
        if: ${{ matrix.platform.setup-gdk-folder != '' }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -91,21 +91,13 @@ jobs:
          sudo apt-get install -y \
            gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev \
            libusb-1.0-0-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev \
-            libxss-dev libxtst-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev \
+            libxss-dev libwayland-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-            libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
+            libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev
      - name: 'CMake (configure + build + tests + examples)'
        run: |
          set -e
          cmake -S ${{ steps.tar.outputs.path }} -B /tmp/build -DSDL_TEST_LIBRARY=TRUE -DSDL_TESTS=TRUE -DSDL_EXAMPLES=TRUE
          cmake --build /tmp/build --verbose
          ctest --test-dir /tmp/build --no-tests=error --output-on-failure
      - name: 'Verify SDL_REVISION contains SDL-'
        run: |
          set -e
          if test "x$(strings /tmp/build/libSDL3.so.0 | grep SDL- | wc -l)" != x1; then
            echo "SDL- string not found: must be present in SDL_REVISION"
            exit 1
          fi
  dmg:
    needs: [src]
@@ -685,7 +677,6 @@ jobs:
              -DTEST_TEST=TRUE \
              -DCMAKE_PREFIX_PATH="${{ steps.sdk.outputs.prefix }}" \
              -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
              -DANDROID_USE_LEGACY_TOOLCHAIN=0 \
              -DANDROID_ABI=${android_abi} \
              -DCMAKE_BUILD_TYPE=Release \
              -B "${android_abi}"
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,6 @@ compile_commands.json
 *.pc
 test/*.test
 wayland-generated-protocols
 CMakeSettings.json
 # for CLion
 .idea
@@ -77,23 +76,28 @@ Release
 *.ncb
 *.suo
 *.sdf
 VisualC/tests/gamepadmap/axis.bmp
 VisualC/tests/gamepadmap/button.bmp
 VisualC/tests/gamepadmap/gamepadmap.bmp
 VisualC/tests/gamepadmap/gamepadmap_back.bmp
 VisualC/tests/loopwave/sample.wav
 VisualC/tests/testautomation/*.bmp
-VisualC/tests/testautomation/*.png
+VisualC/tests/testgamepad/axis.bmp
-VisualC/tests/testcontroller/*.png
+VisualC/tests/testgamepad/button.bmp
 VisualC/tests/testgamepad/gamepadmap.bmp
 VisualC/tests/testgamepad/gamepadmap_back.bmp
 VisualC/tests/testoverlay/moose.dat
-VisualC/tests/testrendertarget/icon.png
+VisualC/tests/testrendertarget/icon.bmp
-VisualC/tests/testrendertarget/sample.png
+VisualC/tests/testrendertarget/sample.bmp
-VisualC/tests/testscale/icon.png
+VisualC/tests/testscale/icon.bmp
-VisualC/tests/testscale/sample.png
+VisualC/tests/testscale/sample.bmp
-VisualC/tests/testsprite/icon.png
+VisualC/tests/testsprite/icon.bmp
-VisualC/tests/testyuv/testyuv.png
+VisualC/tests/testyuv/testyuv.bmp
 VisualC-GDK/**/Layout
 src/render/direct3d12/D3D12_*_One.h
 src/render/direct3d12/D3D12_*_Series.h
 src/gpu/d3d12/D3D12_*_One.h
 src/gpu/d3d12/D3D12_*_Series.h
 out/
 # for Android
 android-project/local.properties
@@ -156,6 +160,7 @@ test/testshader
 test/testshape
 test/testsprite
 test/testspriteminimal
 test/teststreaming
 test/testsurround
 test/testthread
 test/testtimer
--- a/.wikiheaders-options
+++ b/.wikiheaders-options
@@ -9,7 +9,6 @@ versionfname = include/SDL3/SDL_version.h
 versionmajorregex = \A\#define\s+SDL_MAJOR_VERSION\s+(\d+)\Z
 versionminorregex = \A\#define\s+SDL_MINOR_VERSION\s+(\d+)\Z
 versionmicroregex = \A\#define\s+SDL_MICRO_VERSION\s+(\d+)\Z
 apipropertyregex = \A\s*\#\s*define\s+SDL_PROP_
 selectheaderregex = \ASDL.*?\.h\Z
 projecturl = https://libsdl.org/
 wikiurl = https://wiki.libsdl.org
@@ -26,16 +25,8 @@ manpagesymbolfilterregex = \A[US]int\d+\Z
 headercategoryeval = s/\ASDL_test_?.*?\.h\Z//; s/\ASDL_?(.*?)\.h\Z/$1/; ucfirst();
 quickrefenabled = 1
-quickrefcategoryorder = Init,Hints,Error,Version,Properties,Log,Video,Events,Keyboard,Mouse,Touch,Gamepad,Joystick,Haptic,Audio,Time,Timer,Render,SharedObject,Thread,Mutex,Atomic,Filesystem,IOStream,AsyncIO,Storage,Pixels,Surface,Blendmode,Rect,Camera,Clipboard,Dialog,Tray,Messagebox,GPU,Vulkan,Metal,Platform,Power,Sensor,Process,Bits,Endian,Assert,CPUInfo,Intrinsics,Locale,System,Misc,GUID,Main,Stdinc
+quickrefcategoryorder = Init,Hints,Error,Version,Properties,Log,Video,Events,Keyboard,Mouse,Touch,Gamepad,Joystick,Haptic,Audio,Time,Timer,Render,SharedObject,Thread,Mutex,Atomic,Filesystem,IOStream,AsyncIO,Storage,Pixels,Surface,Blendmode,Rect,Camera,Clipboard,Dialog,GPU,Messagebox,Vulkan,Metal,Platform,Power,Sensor,Process,Bits,Endian,Assert,CPUInfo,Intrinsics,Locale,System,Misc,GUID,Main,Stdinc
 quickreftitle = SDL3 API Quick Reference
 quickrefurl = https://libsdl.org/
 quickrefdesc = The latest version of this document can be found at https://wiki.libsdl.org/SDL3/QuickReference
 quickrefmacroregex = \A(SDL_PLATFORM_.*|SDL_.*_INTRINSICS|SDL_Atomic...Ref|SDL_assert.*?|SDL_COMPILE_TIME_ASSERT|SDL_arraysize|SDL_Swap[BL]E\d\d|SDL_[a-z]+_cast)\Z
 envvarenabled = 1
 envvartitle = SDL3 Environment Variables
 envvardesc = SDL3 can be controlled by the user, externally, with environment variables. They are all operate exactly like the [hints you can get and set programmatically](CategoryHints), but named without the `_HINT` part (so `"SDL_HINT_A"` would be environment variable `"SDL_A"`).\n\nThis list matches the latest in SDL3's revision control.
 envvarsymregex = \ASDL_HINT_(.*)\Z
 envvarsymreplace = SDL_$1
--- a/Android.mk
+++ b/Android.mk
@@ -42,7 +42,6 @@ LOCAL_SRC_FILES := \
 	$(wildcard $(LOCAL_PATH)/src/haptic/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/haptic/android/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/haptic/dummy/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/haptic/hidapi/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/hidapi/*.c) \
 	$(wildcard $(LOCAL_PATH)/src/hidapi/android/*.cpp) \
 	$(wildcard $(LOCAL_PATH)/src/joystick/*.c) \
@@ -112,6 +111,8 @@ ifeq ($(NDK_DEBUG),1)
    cmd-strip :=
 endif
 LOCAL_STATIC_LIBRARIES := cpufeatures
 include $(BUILD_SHARED_LIBRARY)
@@ -121,12 +122,6 @@ include $(BUILD_SHARED_LIBRARY)
 #
 ###########################
 include $(CLEAR_VARS)
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include $(LOCAL_PATH)/src
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_MODULE := SDL3_test
 LOCAL_MODULE_FILENAME := libSDL3_test
@@ -143,3 +138,24 @@ LOCAL_EXPORT_LDLIBS :=
 include $(BUILD_STATIC_LIBRARY)
 ###########################
 #
 # SDL static library
 #
 ###########################
 LOCAL_MODULE := SDL3_static
 LOCAL_MODULE_FILENAME := libSDL3
 LOCAL_LDLIBS :=
 LOCAL_LDFLAGS :=
 LOCAL_EXPORT_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -landroid
 include $(BUILD_STATIC_LIBRARY)
 $(call import-module,android/cpufeatures)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/VisualC-GDK/SDL/SDL.vcxproj
+++ b/VisualC-GDK/SDL/SDL.vcxproj
@@ -326,25 +326,23 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_audio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_bits.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_copying.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_dialog.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_dlopennote.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_egl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_endian.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_error.h" />
@@ -354,11 +352,9 @@
    <ClInclude Include="..\..\include\SDL3\SDL_gpu.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_guid.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_hints.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_init.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_intrin.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h" />
@@ -366,13 +362,11 @@
    <ClInclude Include="..\..\include\SDL3\SDL_locale.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_log.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_main.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_main_impl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_metal.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_misc.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_oldnames.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h" />
@@ -391,6 +385,7 @@
    <ClInclude Include="..\..\include\SDL3\SDL_rect.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_render.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_revision.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h" />
@@ -412,7 +407,7 @@
    <ClInclude Include="..\..\include\SDL3\SDL_time.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_timer.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_touch.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_tray.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_types.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_version.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_video.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h" />
@@ -429,7 +424,6 @@
    <ClInclude Include="..\..\src\camera\SDL_camera_c.h" />
    <ClInclude Include="..\..\src\camera\SDL_syscamera.h" />
    <ClInclude Include="..\..\src\core\gdk\SDL_gdk.h" />
    <ClInclude Include="..\..\src\core\SDL_core_unsupported.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_directx.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_gameinput.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_hid.h" />
@@ -460,16 +454,13 @@
    <ClInclude Include="..\..\src\io\SDL_sysasyncio.h" />
    <ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
    <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
    <ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h" />
    <ClInclude Include="..\..\src\haptic\windows\SDL_dinputhaptic_c.h" />
    <ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h" />
    <ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
    <ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
    <ClInclude Include="..\..\src\joystick\controller_type.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_report_descriptor.h" />
    <ClInclude Include="..\..\src\joystick\SDL_gamepad_c.h" />
    <ClInclude Include="..\..\src\joystick\SDL_gamepad_db.h" />
    <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
@@ -505,6 +496,7 @@
    <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
    <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
    <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
    <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
    <ClInclude Include="..\..\src\render\software\SDL_triangle.h" />
    <ClInclude Include="..\..\src\SDL_assert_c.h" />
    <ClInclude Include="..\..\src\SDL_error_c.h" />
@@ -604,11 +596,9 @@
    <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />
    <ClInclude Include="..\..\src\video\SDL_rect_c.h" />
    <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
    <ClInclude Include="..\..\src\video\SDL_rotate.h" />
    <ClInclude Include="..\..\src\video\SDL_stb_c.h" />
    <ClInclude Include="..\..\src\video\SDL_surface_c.h" />
    <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
    <ClInclude Include="..\..\src\video\SDL_video_unsupported.h" />
    <ClInclude Include="..\..\src\video\SDL_vulkan_internal.h" />
    <ClInclude Include="..\..\src\video\SDL_yuv_c.h" />
    <ClInclude Include="..\..\src\video\windows\SDL_msctf.h" />
@@ -653,7 +643,7 @@
    <ClCompile Include="..\..\src\audio\SDL_wave.c" />
    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
    <ClCompile Include="..\..\src\core\SDL_core_unsupported.c" />
-    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.cpp"/>
+    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.c"/>
    <ClCompile Include="..\..\src\core\windows\SDL_hid.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_immdevice.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
@@ -713,39 +703,28 @@
      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.Scarlett.x64'">stdcpp17</LanguageStandard>
      <LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|Gaming.Xbox.XboxOne.x64'">stdcpp17</LanguageStandard>
    </ClCompile>
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c" />
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
    <ClCompile Include="..\..\src\hidapi\SDL_hidapi.c" />
    <ClCompile Include="..\..\src\joystick\controller_type.c" />
    <ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c" />
-    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.cpp" />
+    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapijoystick.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_8bitdo.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_flydigi.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_combined.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gip.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_luna.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps3.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps4.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps5.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_shield.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_sinput.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_stadia.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_triton.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch2.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_wii.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_zuiki.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_report_descriptor.c" />
    <ClCompile Include="..\..\src\joystick\SDL_gamepad.c" />
    <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
    <ClCompile Include="..\..\src\joystick\SDL_steam_virtual_gamepad.c" />
@@ -777,7 +756,6 @@
    <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
    <ClCompile Include="..\..\src\locale\SDL_locale.c" />
    <ClCompile Include="..\..\src\locale\windows\SDL_syslocale.c" />
    <ClCompile Include="..\..\src\misc\SDL_libusb.c" />
    <ClCompile Include="..\..\src\misc\SDL_url.c" />
    <ClCompile Include="..\..\src\misc\windows\SDL_sysurl.c" />
    <ClCompile Include="..\..\src\power\SDL_power.c" />
@@ -812,6 +790,7 @@
    <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
    <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
    <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
    <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
    <ClCompile Include="..\..\src\render\software\SDL_triangle.c" />
    <ClCompile Include="..\..\src\render\vulkan\SDL_render_vulkan.c" />
    <ClCompile Include="..\..\src\render\vulkan\SDL_shaders_vulkan.c" />
@@ -893,7 +872,6 @@
    <ClCompile Include="..\..\src\video\SDL_pixels.c" />
    <ClCompile Include="..\..\src\video\SDL_rect.c" />
    <ClCompile Include="..\..\src\video\SDL_RLEaccel.c" />
    <ClCompile Include="..\..\src\video\SDL_rotate.c" />
    <ClCompile Include="..\..\src\video\SDL_stb.c" />
    <ClCompile Include="..\..\src\video\SDL_stretch.c" />
    <ClCompile Include="..\..\src\video\SDL_surface.c" />
@@ -901,11 +879,12 @@
    <ClCompile Include="..\..\src\video\SDL_video_unsupported.c" />
    <ClCompile Include="..\..\src\video\SDL_vulkan_utils.c" />
    <ClCompile Include="..\..\src\video\SDL_yuv.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_surface_utils.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
-    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.cpp" />
+    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
--- a/VisualC-GDK/SDL/SDL.vcxproj.filters
+++ b/VisualC-GDK/SDL/SDL.vcxproj.filters
@@ -27,7 +27,7 @@
    <ClCompile Include="..\..\src\audio\SDL_wave.c" />
    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
    <ClCompile Include="..\..\src\core\SDL_core_unsupported.c" />
-    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.cpp" />
+    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_hid.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_immdevice.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
@@ -56,39 +56,28 @@
    <ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
    <ClCompile Include="..\..\src\haptic\windows\SDL_dinputhaptic.c" />
    <ClCompile Include="..\..\src\haptic\windows\SDL_windowshaptic.c" />
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c" />
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
    <ClCompile Include="..\..\src\hidapi\SDL_hidapi.c" />
    <ClCompile Include="..\..\src\joystick\controller_type.c" />
    <ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c" />
-    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.cpp" />
+    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapijoystick.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_8bitdo.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_flydigi.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_combined.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gip.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_luna.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps3.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps4.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps5.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_shield.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_sinput.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_stadia.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_triton.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch2.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_wii.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_zuiki.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_report_descriptor.c" />
    <ClCompile Include="..\..\src\joystick\SDL_gamepad.c" />
    <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
    <ClCompile Include="..\..\src\joystick\SDL_steam_virtual_gamepad.c" />
@@ -102,7 +91,6 @@
    <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
    <ClCompile Include="..\..\src\locale\SDL_locale.c" />
    <ClCompile Include="..\..\src\locale\windows\SDL_syslocale.c" />
    <ClCompile Include="..\..\src\misc\SDL_libusb.c" />
    <ClCompile Include="..\..\src\misc\SDL_url.c" />
    <ClCompile Include="..\..\src\misc\windows\SDL_sysurl.c" />
    <ClCompile Include="..\..\src\power\SDL_power.c" />
@@ -129,6 +117,7 @@
    <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
    <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
    <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
    <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
    <ClCompile Include="..\..\src\render\software\SDL_triangle.c" />
    <ClCompile Include="..\..\src\SDL.c" />
    <ClCompile Include="..\..\src\SDL_assert.c" />
@@ -187,7 +176,6 @@
    <ClCompile Include="..\..\src\video\SDL_pixels.c" />
    <ClCompile Include="..\..\src\video\SDL_rect.c" />
    <ClCompile Include="..\..\src\video\SDL_RLEaccel.c" />
    <ClCompile Include="..\..\src\video\SDL_rotate.c" />
    <ClCompile Include="..\..\src\video\SDL_stb.c" />
    <ClCompile Include="..\..\src\video\SDL_stretch.c" />
    <ClCompile Include="..\..\src\video\SDL_surface.c" />
@@ -195,11 +183,12 @@
    <ClCompile Include="..\..\src\video\SDL_video_unsupported.c" />
    <ClCompile Include="..\..\src\video\SDL_vulkan_utils.c" />
    <ClCompile Include="..\..\src\video\SDL_yuv.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_surface_utils.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
-    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.cpp" />
+    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
@@ -239,21 +228,17 @@
    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_std.c" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_audio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_bits.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_copying.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_dialog.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_dlopennote.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_egl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_endian.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_error.h" />
@@ -263,11 +248,8 @@
    <ClInclude Include="..\..\include\SDL3\SDL_gpu.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_guid.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_hints.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_init.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_intrin.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h" />
@@ -275,13 +257,11 @@
    <ClInclude Include="..\..\include\SDL3\SDL_locale.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_log.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_main.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_main_impl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_metal.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_misc.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_oldnames.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h" />
@@ -300,10 +280,10 @@
    <ClInclude Include="..\..\include\SDL3\SDL_rect.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_render.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_revision.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_storage.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_surface.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_system.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_test.h" />
@@ -318,10 +298,9 @@
    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_thread.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_time.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_timer.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_touch.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_tray.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_types.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_version.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_video.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h" />
@@ -342,7 +321,6 @@
    <ClInclude Include="..\..\src\core\windows\SDL_immdevice.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_xinput.h" />
    <ClInclude Include="..\..\src\core\SDL_core_unsupported.h" />
    <ClInclude Include="..\..\src\cpuinfo\SDL_cpuinfo_c.h" />
    <ClInclude Include="..\..\src\dynapi\SDL_dynapi.h" />
    <ClInclude Include="..\..\src\dynapi\SDL_dynapi_overrides.h" />
@@ -364,16 +342,13 @@
    <ClInclude Include="..\..\src\gpu\SDL_sysgpu.h" />
    <ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
    <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
    <ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h" />
    <ClInclude Include="..\..\src\haptic\windows\SDL_dinputhaptic_c.h" />
    <ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h" />
    <ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
    <ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
    <ClInclude Include="..\..\src\joystick\controller_type.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_report_descriptor.h" />
    <ClInclude Include="..\..\src\joystick\SDL_gamepad_c.h" />
    <ClInclude Include="..\..\src\joystick\SDL_gamepad_db.h" />
    <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
@@ -409,6 +384,7 @@
    <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
    <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
    <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
    <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
    <ClInclude Include="..\..\src\render\software\SDL_triangle.h" />
    <ClInclude Include="..\..\src\SDL_assert_c.h" />
    <ClInclude Include="..\..\src\SDL_error_c.h" />
@@ -462,11 +438,9 @@
    <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />
    <ClInclude Include="..\..\src\video\SDL_rect_c.h" />
    <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
    <ClInclude Include="..\..\src\video\SDL_rotate.h" />
    <ClInclude Include="..\..\src\video\SDL_stb_c.h" />
    <ClInclude Include="..\..\src\video\SDL_surface_c.h" />
    <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
    <ClInclude Include="..\..\src\video\SDL_video_unsupported.h" />
    <ClInclude Include="..\..\src\video\SDL_vulkan_internal.h" />
    <ClInclude Include="..\..\src\video\SDL_yuv_c.h" />
    <ClInclude Include="..\..\src\video\windows\SDL_msctf.h" />
--- a/VisualC-GDK/SDL_test/SDL_test.vcxproj
+++ b/VisualC-GDK/SDL_test/SDL_test.vcxproj
@@ -192,12 +192,10 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\..\src\test\SDL_test_internal.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\src\test\SDL_test_assert.c" />
    <ClCompile Include="..\..\src\test\SDL_test_common.c" />
--- a/VisualC-GDK/tests/testcontroller/testcontroller.vcxproj
+++ b/VisualC-GDK/tests/testcontroller/testcontroller.vcxproj
@@ -268,6 +268,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC-GDK/tests/testgdk/src/testgdk.cpp
+++ b/VisualC-GDK/tests/testgdk/src/testgdk.cpp
@@ -56,7 +56,8 @@ static struct
 static SDL_AudioStream *stream;
 /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
-static void quit(int rc)
+static void
 quit(int rc)
 {
    SDL_free(sprites);
    SDL_DestroyAudioStream(stream);
@@ -79,7 +80,8 @@ static int fillerup(void)
    return 0;
 }
-static void UserLoggedIn(XUserHandle user)
+void
 UserLoggedIn(XUserHandle user)
 {
    HRESULT hr;
    char gamertag[128];
@@ -94,7 +96,8 @@ static void UserLoggedIn(XUserHandle user)
    XUserCloseHandle(user);
 }
-static void AddUserUICallback(XAsyncBlock *asyncBlock)
+void
 AddUserUICallback(XAsyncBlock *asyncBlock)
 {
    HRESULT hr;
    XUserHandle user = NULL;
@@ -120,7 +123,8 @@ static void AddUserUICallback(XAsyncBlock *asyncBlock)
    delete asyncBlock;
 }
-static void AddUserUI()
+void
 AddUserUI()
 {
    HRESULT hr;
    XAsyncBlock *asyncBlock = new XAsyncBlock;
@@ -137,7 +141,8 @@ static void AddUserUI()
    }
 }
-static void AddUserSilentCallback(XAsyncBlock *asyncBlock)
+void
 AddUserSilentCallback(XAsyncBlock *asyncBlock)
 {
    HRESULT hr;
    XUserHandle user = NULL;
@@ -163,7 +168,8 @@ static void AddUserSilentCallback(XAsyncBlock *asyncBlock)
    delete asyncBlock;
 }
-static void AddUserSilent()
+void
 AddUserSilent()
 {
    HRESULT hr;
    XAsyncBlock *asyncBlock = new XAsyncBlock;
@@ -180,27 +186,30 @@ static void AddUserSilent()
    }
 }
-static bool LoadSprite(const char *file)
+int
 LoadSprite(const char *file)
 {
    int i;
    for (i = 0; i < state->num_windows; ++i) {
        /* This does the SDL_LoadBMP step repeatedly, but that's OK for test code. */
-        sprites[i] = LoadTexture(state->renderers[i], file, true);
+        sprites[i] = LoadTexture(state->renderers[i], file, true, &sprite_w, &sprite_h);
        if (!sprites[i]) {
-            return false;
+            return -1;
        }
        if (!SDL_SetTextureBlendMode(sprites[i], blendMode)) {
            SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't set blend mode: %s", SDL_GetError());
            SDL_DestroyTexture(sprites[i]);
            return -1;
        }
        sprite_w = sprites[i]->w;
        sprite_h = sprites[i]->h;
        SDL_SetTextureBlendMode(sprites[i], blendMode);
    }
    /* We're ready to roll. :) */
-    return true;
+    return 0;
 }
-static void DrawSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
+void
 DrawSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
 {
    SDL_Rect viewport;
    SDL_FRect temp;
@@ -291,7 +300,8 @@ static void DrawSprites(SDL_Renderer * renderer, SDL_Texture * sprite)
    SDL_RenderPresent(renderer);
 }
-static void loop()
+void
 loop()
 {
    int i;
    SDL_Event event;
@@ -319,7 +329,8 @@ static void loop()
    fillerup();
 }
-int main(int argc, char *argv[])
+int
 main(int argc, char *argv[])
 {
    int i;
    const char *icon = "icon.bmp";
@@ -402,7 +413,7 @@ int main(int argc, char *argv[])
        SDL_SetRenderDrawColor(renderer, 0xA0, 0xA0, 0xA0, 0xFF);
        SDL_RenderClear(renderer);
    }
-    if (!LoadSprite(icon)) {
+    if (LoadSprite(icon) < 0) {
        quit(2);
    }
--- a/VisualC-GDK/tests/testgdk/testgdk.vcxproj
+++ b/VisualC-GDK/tests/testgdk/testgdk.vcxproj
@@ -292,6 +292,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -310,7 +311,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <CopyFileToFolders Include="..\..\..\test\icon.png">
+    <CopyFileToFolders Include="..\..\..\test\icon.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Desktop.x64'">Copying %(Filename)%(Extension)</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.Scarlett.x64'">Copying %(Filename)%(Extension)</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.XboxOne.x64'">Copying %(Filename)%(Extension)</Message>
--- a/VisualC-GDK/tests/testsprite/testsprite.vcxproj
+++ b/VisualC-GDK/tests/testsprite/testsprite.vcxproj
@@ -292,6 +292,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -310,7 +311,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <CopyFileToFolders Include="..\..\..\test\icon.png">
+    <CopyFileToFolders Include="..\..\..\test\icon.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Desktop.x64'">Copying %(Filename)%(Extension)</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.Scarlett.x64'">Copying %(Filename)%(Extension)</Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Gaming.Xbox.XboxOne.x64'">Copying %(Filename)%(Extension)</Message>
--- a/VisualC/SDL.sln
+++ b/VisualC/SDL.sln
@@ -69,7 +69,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "camera", "camera", "{AAEC83
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-read-and-draw", "examples\camera\01-read-and-draw\01-read-and-draw.vcxproj", "{510ACF0C-4012-4216-98EF-E4F155DE33CE}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demo", "demo", "{D1BF59F6-22DC-493B-BDEB-451A50DA793D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "game", "game", "{D1BF59F6-22DC-493B-BDEB-451A50DA793D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-snake", "examples\demo\01-snake\01-snake.vcxproj", "{7820969A-5B7B-4046-BB0A-82905D457FC5}"
 EndProject
@@ -115,24 +115,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02-woodeneye-008", "example
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03-infinite-monkeys", "examples\demo\03-infinite-monkeys\03-infinite-monkeys.vcxproj", "{75AEE75A-C016-4497-960B-D767B822237D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "19-affine-textures", "examples\renderer\19-affine-textures\19-affine-textures.vcxproj", "{E21C50BF-54B4-434C-AA24-9A6469553987}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04-multiple-streams", "examples\audio\04-multiple-streams\04-multiple-streams.vcxproj", "{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asyncio", "asyncio", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "input", "input", "{8DEAE483-FDE7-463F-9FD5-F597BBAED1F9}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-load-bitmaps", "examples\asyncio\01-load-bitmaps\01-load-bitmaps.vcxproj", "{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04-bytepusher", "examples\demo\04-bytepusher\04-bytepusher.vcxproj", "{3DB9B219-769E-43AC-8B8B-319DB6045DCF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01-joystick-polling", "examples\input\01-joystick-polling\01-joystick-polling.vcxproj", "{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02-joystick-events", "examples\input\02-joystick-events\02-joystick-events.vcxproj", "{FCBDF2B2-1129-49AE-9406-3F219E65CA89}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsoftwaretransparent", "tests\testsoftwaretransparent\testsoftwaretransparent.vcxproj", "{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -533,62 +515,6 @@ Global
 		{75AEE75A-C016-4497-960B-D767B822237D}.Release|Win32.Build.0 = Release|Win32
 		{75AEE75A-C016-4497-960B-D767B822237D}.Release|x64.ActiveCfg = Release|x64
 		{75AEE75A-C016-4497-960B-D767B822237D}.Release|x64.Build.0 = Release|x64
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Debug|Win32.Build.0 = Debug|Win32
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Debug|x64.ActiveCfg = Debug|x64
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Debug|x64.Build.0 = Debug|x64
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Release|Win32.ActiveCfg = Release|Win32
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Release|Win32.Build.0 = Release|Win32
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Release|x64.ActiveCfg = Release|x64
 		{E21C50BF-54B4-434C-AA24-9A6469553987}.Release|x64.Build.0 = Release|x64
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Debug|Win32.Build.0 = Debug|Win32
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Debug|x64.ActiveCfg = Debug|x64
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Debug|x64.Build.0 = Debug|x64
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Release|Win32.ActiveCfg = Release|Win32
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Release|Win32.Build.0 = Release|Win32
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Release|x64.ActiveCfg = Release|x64
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}.Release|x64.Build.0 = Release|x64
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Debug|Win32.Build.0 = Debug|Win32
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Debug|x64.ActiveCfg = Debug|x64
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Debug|x64.Build.0 = Debug|x64
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Release|Win32.ActiveCfg = Release|Win32
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Release|Win32.Build.0 = Release|Win32
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Release|x64.ActiveCfg = Release|x64
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}.Release|x64.Build.0 = Release|x64
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Debug|Win32.Build.0 = Debug|Win32
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Debug|x64.ActiveCfg = Debug|x64
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Debug|x64.Build.0 = Debug|x64
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Release|Win32.ActiveCfg = Release|Win32
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Release|Win32.Build.0 = Release|Win32
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Release|x64.ActiveCfg = Release|x64
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF}.Release|x64.Build.0 = Release|x64
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Debug|Win32.Build.0 = Debug|Win32
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Debug|x64.ActiveCfg = Debug|x64
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Debug|x64.Build.0 = Debug|x64
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Release|Win32.ActiveCfg = Release|Win32
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Release|Win32.Build.0 = Release|Win32
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Release|x64.ActiveCfg = Release|x64
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}.Release|x64.Build.0 = Release|x64
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Debug|Win32.Build.0 = Debug|Win32
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Debug|x64.ActiveCfg = Debug|x64
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Debug|x64.Build.0 = Debug|x64
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Release|Win32.ActiveCfg = Release|Win32
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Release|Win32.Build.0 = Release|Win32
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Release|x64.ActiveCfg = Release|x64
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89}.Release|x64.Build.0 = Release|x64
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Debug|Win32.Build.0 = Debug|Win32
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Debug|x64.ActiveCfg = Debug|x64
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Debug|x64.Build.0 = Debug|x64
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Release|Win32.ActiveCfg = Release|Win32
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Release|Win32.Build.0 = Release|Win32
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Release|x64.ActiveCfg = Release|x64
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -646,15 +572,6 @@ Global
 		{608C6C67-7766-471F-BBFF-8B00086039AF} = {1B61A1B7-92DE-4C37-9151-D2928D6449AB}
 		{A3F601E0-B54C-4DD8-8A97-FDEF7624EE60} = {D1BF59F6-22DC-493B-BDEB-451A50DA793D}
 		{75AEE75A-C016-4497-960B-D767B822237D} = {D1BF59F6-22DC-493B-BDEB-451A50DA793D}
 		{E21C50BF-54B4-434C-AA24-9A6469553987} = {F91DDAF0-B74F-4516-A1A9-42ED8DFCBF6A}
 		{7117A55C-BE4E-41DB-A4FC-4070E35A8B28} = {1B61A1B7-92DE-4C37-9151-D2928D6449AB}
 		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {1498F0CD-F4DA-4847-9CB2-FB18D48061D5}
 		{8DEAE483-FDE7-463F-9FD5-F597BBAED1F9} = {1498F0CD-F4DA-4847-9CB2-FB18D48061D5}
 		{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{3DB9B219-769E-43AC-8B8B-319DB6045DCF} = {D1BF59F6-22DC-493B-BDEB-451A50DA793D}
 		{B3852DB7-E925-4026-8B9D-D2272EFEFF3C} = {8DEAE483-FDE7-463F-9FD5-F597BBAED1F9}
 		{FCBDF2B2-1129-49AE-9406-3F219E65CA89} = {8DEAE483-FDE7-463F-9FD5-F597BBAED1F9}
 		{D91C45E2-274E-4C0F-89C7-9986F9A7E85A} = {D69D5741-611F-4E14-8541-1FEE94F50B5A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C320C9F2-1A8F-41D7-B02B-6338F872BCAD}
--- a/VisualC/SDL/SDL.vcxproj
+++ b/VisualC/SDL/SDL.vcxproj
@@ -82,16 +82,16 @@
    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">C:\Program Files %28x86%29\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>$(ProjectDir)/../../src;$(ProjectDir)/../../src/core/windows;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)/../../src;$(IncludePath)</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>$(ProjectDir)/../../src;$(ProjectDir)/../../src/core/windows;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)/../../src;$(IncludePath)</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>$(ProjectDir)/../../src;$(ProjectDir)/../../src/core/windows;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)/../../src;$(IncludePath)</IncludePath>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>$(ProjectDir)/../../src;$(ProjectDir)/../../src/core/windows;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)/../../src;$(IncludePath)</IncludePath>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <PreBuildEvent>
@@ -239,25 +239,23 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_audio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_bits.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_copying.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_dialog.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_dlopennote.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_egl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_endian.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_error.h" />
@@ -267,11 +265,9 @@
    <ClInclude Include="..\..\include\SDL3\SDL_gpu.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_guid.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_hints.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_init.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_intrin.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h" />
@@ -279,13 +275,11 @@
    <ClInclude Include="..\..\include\SDL3\SDL_locale.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_log.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_main.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_main_impl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_metal.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_misc.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_oldnames.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h" />
@@ -304,6 +298,7 @@
    <ClInclude Include="..\..\include\SDL3\SDL_rect.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_render.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_revision.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h" />
@@ -325,7 +320,6 @@
    <ClInclude Include="..\..\include\SDL3\SDL_time.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_timer.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_touch.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_tray.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_version.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_video.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h" />
@@ -341,7 +335,6 @@
    <ClInclude Include="..\..\src\audio\wasapi\SDL_wasapi.h" />
    <ClInclude Include="..\..\src\camera\SDL_camera_c.h" />
    <ClInclude Include="..\..\src\camera\SDL_syscamera.h" />
    <ClInclude Include="..\..\src\core\SDL_core_unsupported.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_directx.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_gameinput.h" />
    <ClInclude Include="..\..\src\core\windows\SDL_hid.h" />
@@ -374,16 +367,13 @@
    <ClInclude Include="..\..\src\io\SDL_sysasyncio.h" />
    <ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
    <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
    <ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h" />
    <ClInclude Include="..\..\src\haptic\windows\SDL_dinputhaptic_c.h" />
    <ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h" />
    <ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
    <ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
    <ClInclude Include="..\..\src\joystick\controller_type.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.h" />
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_report_descriptor.h" />
    <ClInclude Include="..\..\src\joystick\SDL_gamepad_c.h" />
    <ClInclude Include="..\..\src\joystick\SDL_gamepad_db.h" />
    <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
@@ -418,6 +408,7 @@
    <ClInclude Include="..\..\src\render\software\SDL_drawline.h" />
    <ClInclude Include="..\..\src\render\software\SDL_drawpoint.h" />
    <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
    <ClInclude Include="..\..\src\render\software\SDL_rotate.h" />
    <ClInclude Include="..\..\src\render\software\SDL_triangle.h" />
    <ClInclude Include="..\..\src\render\vulkan\SDL_shaders_vulkan.h" />
    <ClInclude Include="..\..\src\SDL_assert_c.h" />
@@ -431,16 +422,6 @@
    <ClCompile Include="..\..\src\camera\dummy\SDL_camera_dummy.c" />
    <ClCompile Include="..\..\src\camera\mediafoundation\SDL_camera_mediafoundation.c" />
    <ClCompile Include="..\..\src\camera\SDL_camera.c" />
    <ClCompile Include="..\..\src\core\windows\pch_cpp.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
    </ClCompile>
    <ClCompile Include="..\..\src\dialog\SDL_dialog.c" />
    <ClCompile Include="..\..\src\dialog\SDL_dialog_utils.c" />
    <ClCompile Include="..\..\src\filesystem\SDL_filesystem.c" />
@@ -513,11 +494,9 @@
    <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />
    <ClInclude Include="..\..\src\video\SDL_rect_c.h" />
    <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
    <ClInclude Include="..\..\src\video\SDL_rotate.h" />
    <ClInclude Include="..\..\src\video\SDL_stb_c.h" />
    <ClInclude Include="..\..\src\video\SDL_surface_c.h" />
    <ClInclude Include="..\..\src\video\SDL_sysvideo.h" />
    <ClInclude Include="..\..\src\video\SDL_video_unsupported.h" />
    <ClInclude Include="..\..\src\video\SDL_vulkan_internal.h" />
    <ClInclude Include="..\..\src\video\SDL_yuv_c.h" />
    <ClInclude Include="..\..\src\video\windows\SDL_msctf.h" />
@@ -562,12 +541,7 @@
    <ClCompile Include="..\..\src\audio\SDL_wave.c" />
    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
    <ClCompile Include="..\..\src\core\SDL_core_unsupported.c" />
-    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.cpp">
+    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.c" />
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
    </ClCompile>
    <ClCompile Include="..\..\src\core\windows\SDL_hid.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_immdevice.c" />
    <ClCompile Include="..\..\src\core\windows\SDL_windows.c" />
@@ -599,44 +573,28 @@
    <ClCompile Include="..\..\src\haptic\SDL_haptic.c" />
    <ClCompile Include="..\..\src\haptic\windows\SDL_dinputhaptic.c" />
    <ClCompile Include="..\..\src\haptic\windows\SDL_windowshaptic.c" />
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c" />
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c" />
    <ClCompile Include="..\..\src\hidapi\SDL_hidapi.c" />
    <ClCompile Include="..\..\src\joystick\controller_type.c" />
    <ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c" />
-    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.cpp">
+    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.c" />
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapijoystick.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_8bitdo.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_flydigi.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_combined.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gamecube.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gip.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_luna.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps3.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps4.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_ps5.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_shield.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_sinput.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_stadia.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_hori.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_triton.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steamdeck.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch2.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_wii.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xbox360w.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_zuiki.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_report_descriptor.c" />
    <ClCompile Include="..\..\src\joystick\SDL_gamepad.c" />
    <ClCompile Include="..\..\src\joystick\SDL_joystick.c" />
    <ClCompile Include="..\..\src\joystick\SDL_steam_virtual_gamepad.c" />
@@ -650,7 +608,6 @@
    <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c" />
    <ClCompile Include="..\..\src\locale\SDL_locale.c" />
    <ClCompile Include="..\..\src\locale\windows\SDL_syslocale.c" />
    <ClCompile Include="..\..\src\misc\SDL_libusb.c" />
    <ClCompile Include="..\..\src\misc\SDL_url.c" />
    <ClCompile Include="..\..\src\misc\windows\SDL_sysurl.c" />
    <ClCompile Include="..\..\src\power\SDL_power.c" />
@@ -679,6 +636,7 @@
    <ClCompile Include="..\..\src\render\software\SDL_drawline.c" />
    <ClCompile Include="..\..\src\render\software\SDL_drawpoint.c" />
    <ClCompile Include="..\..\src\render\software\SDL_render_sw.c" />
    <ClCompile Include="..\..\src\render\software\SDL_rotate.c" />
    <ClCompile Include="..\..\src\render\software\SDL_triangle.c" />
    <ClCompile Include="..\..\src\SDL.c" />
    <ClCompile Include="..\..\src\SDL_assert.c" />
@@ -749,7 +707,6 @@
    <ClCompile Include="..\..\src\video\SDL_pixels.c" />
    <ClCompile Include="..\..\src\video\SDL_rect.c" />
    <ClCompile Include="..\..\src\video\SDL_RLEaccel.c" />
    <ClCompile Include="..\..\src\video\SDL_rotate.c" />
    <ClCompile Include="..\..\src\video\SDL_stb.c" />
    <ClCompile Include="..\..\src\video\SDL_stretch.c" />
    <ClCompile Include="..\..\src\video\SDL_surface.c" />
@@ -757,16 +714,12 @@
    <ClCompile Include="..\..\src\video\SDL_video_unsupported.c" />
    <ClCompile Include="..\..\src\video\SDL_vulkan_utils.c" />
    <ClCompile Include="..\..\src\video\SDL_yuv.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_surface_utils.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsevents.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsframebuffer.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c" />
-    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.cpp">
+    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.c" />
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
      <PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
    </ClCompile>
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmodes.c" />
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmouse.c" />
--- a/VisualC/SDL/SDL.vcxproj.filters
+++ b/VisualC/SDL/SDL.vcxproj.filters
@@ -82,9 +82,6 @@
    <Filter Include="haptic\windows">
      <UniqueIdentifier>{ebc2fca3-3c26-45e3-815e-3e0581d5e226}</UniqueIdentifier>
    </Filter>
    <Filter Include="haptic\hidapi">
      <UniqueIdentifier>{06DB01C0-65B5-4DE7-8ADC-C0B0CA3A1E69}</UniqueIdentifier>
    </Filter>
    <Filter Include="haptic\dummy">
      <UniqueIdentifier>{47c445a2-7014-4e15-9660-7c89a27dddcf}</UniqueIdentifier>
    </Filter>
@@ -222,51 +219,42 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_assert.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_audio.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_begin_code.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_bits.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_camera.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_close_code.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_copying.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_dialog.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_dlopennote.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_egl.h">
      <Filter>API Headers</Filter>
    </ClInclude>
@@ -285,28 +273,19 @@
    <ClInclude Include="..\..\include\SDL3\SDL_gamepad.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_gpu.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_guid.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_hints.h">
      <Filter>API Headers</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_init.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h">
      <Filter>API Headers</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_intrin.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_asyncio.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h">
@@ -330,27 +309,15 @@
    <ClInclude Include="..\..\include\SDL3\SDL_main.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_main_impl.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_metal.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_misc.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_oldnames.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h">
      <Filter>API Headers</Filter>
    </ClInclude>
@@ -405,6 +372,9 @@
    <ClInclude Include="..\..\include\SDL3\SDL_revision.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_iostream.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h">
      <Filter>API Headers</Filter>
    </ClInclude>
@@ -414,9 +384,6 @@
    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_storage.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_surface.h">
      <Filter>API Headers</Filter>
    </ClInclude>
@@ -453,24 +420,15 @@
    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_thread.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_time.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_timer.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_touch.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_tray.h">
      <Filter>API Headers</Filter>
    </ClInclude>
    <ClInclude Include="..\..\include\SDL3\SDL_version.h">
      <Filter>API Headers</Filter>
    </ClInclude>
@@ -528,9 +486,6 @@
    <ClInclude Include="..\..\src\audio\SDL_audioresample.h">
      <Filter>audio</Filter>
    </ClInclude>
    <ClCompile Include="..\..\src\core\SDL_core_unsupported.h">
      <Filter>core</Filter>
    </ClCompile>
    <ClInclude Include="..\..\src\core\windows\SDL_directx.h">
      <Filter>core\windows</Filter>
    </ClInclude>
@@ -579,6 +534,9 @@
    <ClInclude Include="..\..\src\events\SDL_events_c.h">
      <Filter>events</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\events\SDL_eventfilter_c.h">
      <Filter>events</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\events\SDL_keyboard_c.h">
      <Filter>events</Filter>
    </ClInclude>
@@ -606,9 +564,6 @@
    <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h">
      <Filter>haptic</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h">
      <Filter>haptic</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\haptic\SDL_haptic_c.h">
      <Filter>haptic</Filter>
    </ClInclude>
@@ -666,18 +621,12 @@
    <ClInclude Include="..\..\src\haptic\windows\SDL_windowshaptic_c.h">
      <Filter>haptic\windows</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h">
      <Filter>haptic\hidapi</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapijoystick_c.h">
      <Filter>joystick\hidapi</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.h">
      <Filter>joystick\hidapi</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\joystick\hidapi\SDL_report_descriptor.h">
      <Filter>joystick\hidapi</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\joystick\windows\SDL_dinputjoystick_c.h">
      <Filter>joystick\windows</Filter>
    </ClInclude>
@@ -696,9 +645,6 @@
    <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h">
      <Filter>video</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\video\SDL_rotate.h">
      <Filter>video</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\video\SDL_surface_c.h">
      <Filter>video</Filter>
    </ClInclude>
@@ -732,15 +678,12 @@
    <ClInclude Include="..\..\src\video\SDL_stb_c.h">
      <Filter>video</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\src\video\SDL_video_unsupported.h">
+    <ClInclude Include="..\..\src\video\SDL_yuv_c.h">
      <Filter>video</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\video\SDL_vulkan_internal.h">
      <Filter>video</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\video\SDL_yuv_c.h">
      <Filter>video</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h">
      <Filter>video\dummy</Filter>
    </ClInclude>
@@ -891,6 +834,9 @@
    <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h">
      <Filter>render\software</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\render\software\SDL_rotate.h">
      <Filter>render\software</Filter>
    </ClInclude>
    <ClInclude Include="..\..\src\render\software\SDL_triangle.h">
      <Filter>render\software</Filter>
    </ClInclude>
@@ -1007,7 +953,6 @@
    <ClInclude Include="..\..\include\SDL3\SDL_storage.h" />
    <ClInclude Include="..\..\include\SDL3\SDL_time.h" />
    <ClInclude Include="..\..\src\events\SDL_categories_c.h" />
    <ClInclude Include="..\..\src\events\SDL_eventwatch_c.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
@@ -1095,7 +1040,7 @@
    <ClCompile Include="..\..\src\core\SDL_core_unsupported.c">
      <Filter>core</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.cpp">
+    <ClCompile Include="..\..\src\core\windows\SDL_gameinput.c">
      <Filter>core\windows</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\core\windows\SDL_hid.c">
@@ -1134,6 +1079,9 @@
    <ClCompile Include="..\..\src\events\SDL_events.c">
      <Filter>events</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\events\SDL_eventfilter.c">
      <Filter>events</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\events\SDL_keyboard.c">
      <Filter>events</Filter>
    </ClCompile>
@@ -1185,9 +1133,6 @@
    <ClCompile Include="..\..\src\loadso\windows\SDL_sysloadso.c">
      <Filter>loadso\windows</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\misc\SDL_libusb.c">
      <Filter>misc</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\misc\SDL_url.c">
      <Filter>misc</Filter>
    </ClCompile>
@@ -1218,36 +1163,21 @@
    <ClCompile Include="..\..\src\haptic\windows\SDL_windowshaptic.c">
      <Filter>haptic\windows</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic.c">
      <Filter>haptic\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_lg4ff.c">
      <Filter>haptic\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\haptic\dummy\SDL_syshaptic.c">
      <Filter>haptic\dummy</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\dummy\SDL_sysjoystick.c">
      <Filter>joystick\dummy</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.cpp">
+    <ClCompile Include="..\..\src\joystick\gdk\SDL_gameinputjoystick.c">
      <Filter>joystick\gdk</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_8bitdo.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_flydigi.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_combined.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gamecube.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_gip.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_luna.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
@@ -1266,9 +1196,6 @@
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_shield.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_sinput.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_stadia.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
@@ -1284,9 +1211,6 @@
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_switch2.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_wii.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
@@ -1299,18 +1223,9 @@
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_xboxone.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_lg4ff.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_zuiki.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapijoystick.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_report_descriptor.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\joystick\windows\SDL_dinputjoystick.c">
      <Filter>joystick\windows</Filter>
    </ClCompile>
@@ -1386,9 +1301,6 @@
    <ClCompile Include="..\..\src\video\SDL_rect.c">
      <Filter>video</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\video\SDL_rotate.c">
      <Filter>video</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\video\SDL_stb.c">
      <Filter>video</Filter>
    </ClCompile>
@@ -1419,6 +1331,9 @@
    <ClCompile Include="..\..\src\video\dummy\SDL_nullvideo.c">
      <Filter>video\dummy</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\video\windows\SDL_surface_utils.c">
      <Filter>video\windows</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\video\windows\SDL_windowsclipboard.c">
      <Filter>video\windows</Filter>
    </ClCompile>
@@ -1431,7 +1346,7 @@
    <ClCompile Include="..\..\src\video\windows\SDL_windowskeyboard.c">
      <Filter>video\windows</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.cpp">
+    <ClCompile Include="..\..\src\video\windows\SDL_windowsgameinput.c">
      <Filter>video\windows</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\video\windows\SDL_windowsmessagebox.c">
@@ -1544,6 +1459,8 @@
    </ClCompile>
    <ClCompile Include="..\..\src\sensor\windows\SDL_windowssensor.c">
      <Filter>sensor\windows</Filter>
    </ClCompile>
      <Filter>render</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\render\SDL_render.c">
      <Filter>render</Filter>
@@ -1596,6 +1513,9 @@
    <ClCompile Include="..\..\src\render\software\SDL_render_sw.c">
      <Filter>render\software</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\render\software\SDL_rotate.c">
      <Filter>render\software</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\render\software\SDL_triangle.c">
      <Filter>render\software</Filter>
    </ClCompile>
@@ -1664,15 +1584,11 @@
    <ClCompile Include="..\..\src\storage\generic\SDL_genericstorage.c" />
    <ClCompile Include="..\..\src\storage\steam\SDL_steamstorage.c" />
    <ClCompile Include="..\..\src\storage\SDL_storage.c" />
    <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_triton.c">
      <Filter>joystick\hidapi</Filter>
    </ClCompile>
    <ClCompile Include="..\..\src\events\SDL_eventwatch.c" />
    <ClCompile Include="..\..\src\core\windows\pch_cpp.cpp">
      <Filter>core\windows</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="..\..\src\core\windows\version.rc" />
  </ItemGroup>
  <ItemGroup>
    <MASM Include="..\..\src\stdlib\SDL_mslibc_x64.masm" />
  </ItemGroup>
 </Project>
--- a/VisualC/SDL_test/SDL_test.vcxproj
+++ b/VisualC/SDL_test/SDL_test.vcxproj
@@ -158,12 +158,10 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\..\src\test\SDL_test_internal.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\src\test\SDL_test_assert.c" />
    <ClCompile Include="..\..\src\test\SDL_test_common.c" />
--- a/VisualC/examples/asyncio/01-load-bitmaps/01-load-bitmaps.vcxproj
+++ b/VisualC/examples/asyncio/01-load-bitmaps/01-load-bitmaps.vcxproj
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{6A2BFA8B-C027-400D-A18B-3E9E1CC4DDD0}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\asyncio\01-load-bitmaps\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\asyncio\01-load-bitmaps\load-bitmaps.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/audio/04-multiple-streams/04-multiple-streams.vcxproj
+++ b/VisualC/examples/audio/04-multiple-streams/04-multiple-streams.vcxproj
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{7117A55C-BE4E-41DB-A4FC-4070E35A8B28}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\audio\04-multiple-streams\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\audio\04-multiple-streams\multiple-streams.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/demo/04-bytepusher/04-bytepusher.vcxproj
+++ b/VisualC/examples/demo/04-bytepusher/04-bytepusher.vcxproj
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{3DB9B219-769E-43AC-8B8B-319DB6045DCF}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\demo\04-bytepusher\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\demo\04-bytepusher\bytepusher.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/generate.py
+++ b/VisualC/examples/generate.py
@@ -47,8 +47,7 @@ def main():
    for category in path.iterdir():
        if category.is_dir():
            for example in category.iterdir():
-                if example.is_dir():
+                generate(category.name, example.name, get_c_source_filename(example))
                     generate(category.name, example.name, get_c_source_filename(example))
 if __name__ == "__main__":
--- a/VisualC/examples/input/01-joystick-polling/01-joystick-polling.vcxproj
+++ b/VisualC/examples/input/01-joystick-polling/01-joystick-polling.vcxproj
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{B3852DB7-E925-4026-8B9D-D2272EFEFF3C}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\input\01-joystick-polling\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\input\01-joystick-polling\joystick-polling.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/input/02-joystick-events/02-joystick-events.vcxproj
+++ b/VisualC/examples/input/02-joystick-events/02-joystick-events.vcxproj
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{FCBDF2B2-1129-49AE-9406-3F219E65CA89}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\input\02-joystick-events\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\input\02-joystick-events\joystick-events.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/06-textures/06-textures.vcxproj
+++ b/VisualC/examples/renderer/06-textures/06-textures.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\06-textures\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\06-textures\textures.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/08-rotating-textures/08-rotating-textures.vcxproj
+++ b/VisualC/examples/renderer/08-rotating-textures/08-rotating-textures.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\08-rotating-textures\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\08-rotating-textures\rotating-textures.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/10-geometry/10-geometry.vcxproj
+++ b/VisualC/examples/renderer/10-geometry/10-geometry.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\10-geometry\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\10-geometry\geometry.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/11-color-mods/11-color-mods.vcxproj
+++ b/VisualC/examples/renderer/11-color-mods/11-color-mods.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\11-color-mods\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\11-color-mods\color-mods.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/14-viewport/14-viewport.vcxproj
+++ b/VisualC/examples/renderer/14-viewport/14-viewport.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\14-viewport\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\14-viewport\viewport.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/15-cliprect/15-cliprect.vcxproj
+++ b/VisualC/examples/renderer/15-cliprect/15-cliprect.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\15-cliprect\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\15-cliprect\cliprect.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/17-read-pixels/17-read-pixels.vcxproj
+++ b/VisualC/examples/renderer/17-read-pixels/17-read-pixels.vcxproj
@@ -8,7 +8,7 @@
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\17-read-pixels\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\17-read-pixels\read-pixels.c" />
-    <Content Include="$(SolutionDir)\..\test\sample.png" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="$(SolutionDir)\..\test\sample.bmp" CopyToOutputDirectory="PreserveNewest" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/examples/renderer/19-affine-textures/19-affine-textures.vcxproj
+++ b/VisualC/examples/renderer/19-affine-textures/19-affine-textures.vcxproj
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{E21C50BF-54B4-434C-AA24-9A6469553987}</ProjectGuid>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ItemGroup>
    <None Include="$(SolutionDir)\..\examples\renderer\19-affine-textures\README.txt" />
    <ClCompile Include="$(SolutionDir)\..\examples\renderer\19-affine-textures\affine-textures.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/VisualC/tests/checkkeys/checkkeys.vcxproj
+++ b/VisualC/tests/checkkeys/checkkeys.vcxproj
@@ -189,6 +189,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/loopwave/loopwave.vcxproj
+++ b/VisualC/tests/loopwave/loopwave.vcxproj
@@ -189,6 +189,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testatomic/testatomic.vcxproj
+++ b/VisualC/tests/testatomic/testatomic.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testautomation/testautomation.vcxproj
+++ b/VisualC/tests/testautomation/testautomation.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testcontroller/testcontroller.vcxproj
+++ b/VisualC/tests/testcontroller/testcontroller.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testdialog/testdialog.vcxproj
+++ b/VisualC/tests/testdialog/testdialog.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testdraw/testdraw.vcxproj
+++ b/VisualC/tests/testdraw/testdraw.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testfile/testfile.vcxproj
+++ b/VisualC/tests/testfile/testfile.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testgl/testgl.vcxproj
+++ b/VisualC/tests/testgl/testgl.vcxproj
@@ -187,6 +187,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testgles2/testgles2.vcxproj
+++ b/VisualC/tests/testgles2/testgles2.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testoverlay/testoverlay.vcxproj
+++ b/VisualC/tests/testoverlay/testoverlay.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testpen/testpen.vcxproj
+++ b/VisualC/tests/testpen/testpen.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testplatform/testplatform.vcxproj
+++ b/VisualC/tests/testplatform/testplatform.vcxproj
@@ -195,6 +195,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testpower/testpower.vcxproj
+++ b/VisualC/tests/testpower/testpower.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testrendertarget/testrendertarget.vcxproj
+++ b/VisualC/tests/testrendertarget/testrendertarget.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -201,7 +202,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="..\..\..\test\icon.png">
+    <CustomBuild Include="..\..\..\test\icon.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(ProjectDir)\"
 </Command>
@@ -219,7 +220,7 @@
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)\%(Filename)%(Extension);%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\..\..\test\sample.png">
+    <CustomBuild Include="..\..\..\test\sample.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(ProjectDir)\"
 </Command>
--- a/VisualC/tests/testrumble/testrumble.vcxproj
+++ b/VisualC/tests/testrumble/testrumble.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testscale/testscale.vcxproj
+++ b/VisualC/tests/testscale/testscale.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -201,7 +202,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="..\..\..\test\icon.png">
+    <CustomBuild Include="..\..\..\test\icon.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(ProjectDir)\"
 </Command>
@@ -219,7 +220,7 @@
 </Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)\%(Filename)%(Extension);%(Outputs)</Outputs>
    </CustomBuild>
-    <CustomBuild Include="..\..\..\test\sample.png">
+    <CustomBuild Include="..\..\..\test\sample.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(ProjectDir)\"
 </Command>
--- a/VisualC/tests/testsensor/testsensor.vcxproj
+++ b/VisualC/tests/testsensor/testsensor.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testshape/testshape.vcxproj
+++ b/VisualC/tests/testshape/testshape.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testsoftwaretransparent/testsoftwaretransparent.vcxproj
+++ b/VisualC/tests/testsoftwaretransparent/testsoftwaretransparent.vcxproj
@@ -1,209 +0,0 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Debug|x64">
      <Configuration>Debug</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|x64">
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{D91C45E2-274E-4C0F-89C7-9986F9A7E85A}</ProjectGuid>
    <RootNamespace>testsoftwaretransparent</RootNamespace>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset Condition="'$(VisualStudioVersion)' != '10.0'">$(DefaultPlatformToolset)</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
      <TypeLibraryName>.\Release/testsoftwaretransparent.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Midl>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\Release/testsoftwaretransparent.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <SubSystem>Windows</SubSystem>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Midl>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>Win32</TargetEnvironment>
      <TypeLibraryName>.\Debug/testsoftwaretransparent.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>OldStyle</DebugInformationFormat>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <Midl>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MkTypLibCompatible>true</MkTypLibCompatible>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <TargetEnvironment>X64</TargetEnvironment>
      <TypeLibraryName>.\Debug/testsoftwaretransparent.tlb</TypeLibraryName>
    </Midl>
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>OldStyle</DebugInformationFormat>
    </ClCompile>
    <ResourceCompile>
      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <Culture>0x0409</Culture>
    </ResourceCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Windows</SubSystem>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\SDL\SDL.vcxproj">
      <Project>{81ce8daf-ebb2-4761-8e45-b71abcca8c68}</Project>
      <Private>false</Private>
      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    </ProjectReference>
    <ProjectReference Include="..\..\SDL_test\SDL_test.vcxproj">
      <Project>{da956fd3-e143-46f2-9fe5-c77bebc56b1a}</Project>
      <Private>false</Private>
      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\test\testsoftwaretransparent.c" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
 </Project>
--- a/VisualC/tests/testsprite/testsprite.vcxproj
+++ b/VisualC/tests/testsprite/testsprite.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -201,7 +202,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="..\..\..\test\icon.png">
+    <CustomBuild Include="..\..\..\test\icon.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(ProjectDir)\"
 </Command>
--- a/VisualC/tests/testsurround/testsurround.vcxproj
+++ b/VisualC/tests/testsurround/testsurround.vcxproj
@@ -189,6 +189,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testvulkan/testvulkan.vcxproj
+++ b/VisualC/tests/testvulkan/testvulkan.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testwm/testwm.vcxproj
+++ b/VisualC/tests/testwm/testwm.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
--- a/VisualC/tests/testyuv/testyuv.vcxproj
+++ b/VisualC/tests/testyuv/testyuv.vcxproj
@@ -183,6 +183,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(TreatWarningsAsError)'!=''">
    <ClCompile>
      <AdditionalOptions>%(AdditionalOptions) /utf-8</AdditionalOptions>
      <TreatWarningAsError>$(TreatWarningsAsError)</TreatWarningAsError>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -201,7 +202,7 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <CustomBuild Include="..\..\..\test\testyuv.png">
+    <CustomBuild Include="..\..\..\test\testyuv.bmp">
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying %(Filename)%(Extension)</Message>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" "$(ProjectDir)\"
 </Command>
--- a/WhatsNew.txt
+++ b/WhatsNew.txt
@@ -1,134 +1,16 @@
 This is a list of major changes in SDL's version history.
 ---------------------------------------------------------------------------
 3.4.0:
 ---------------------------------------------------------------------------
 General:
 * Added SDL_CreateAnimatedCursor() to create animated color cursors
 * Added SDL_HINT_MOUSE_DPI_SCALE_CURSORS to automatically scale cursors based on the display scale
 * Added SDL_SetWindowProgressState(), SDL_SetWindowProgressValue(), SDL_GetWindowProgressState(), and SDL_GetWindowProgressValue() to show progress in the window's taskbar icon on Windows and Linux
 * Added GPU device creation properties to enable the GPU API on older hardware if you're not using these features:
  - SDL_PROP_GPU_DEVICE_CREATE_FEATURE_CLIP_DISTANCE_BOOLEAN
  - SDL_PROP_GPU_DEVICE_CREATE_FEATURE_DEPTH_CLAMPING_BOOLEAN
  - SDL_PROP_GPU_DEVICE_CREATE_FEATURE_INDIRECT_DRAW_FIRST_INSTANCE_BOOLEAN
  - SDL_PROP_GPU_DEVICE_CREATE_FEATURE_ANISOTROPY_BOOLEAN
  - SDL_PROP_GPU_DEVICE_CREATE_D3D12_ALLOW_FEWER_RESOURCE_SLOTS_BOOLEAN
 * Added SDL_PROP_GPU_DEVICE_CREATE_VULKAN_OPTIONS_POINTER to enable configuring Vulkan features when creating a GPU device
 * Added SDL_PROP_GPU_DEVICE_CREATE_VULKAN_REQUIRE_HARDWARE_ACCELERATION_BOOLEAN to allow requiring Vulkan hardware acceleration when creating a GPU device
 * Added SDL_GetGPUDeviceProperties() to query information from a GPU device:
  - SDL_PROP_GPU_DEVICE_NAME_STRING
  - SDL_PROP_GPU_DEVICE_DRIVER_NAME_STRING
  - SDL_PROP_GPU_DEVICE_DRIVER_VERSION_STRING
  - SDL_PROP_GPU_DEVICE_DRIVER_INFO_STRING
 * Added SDL_GetPixelFormatFromGPUTextureFormat() and SDL_GetGPUTextureFormatFromPixelFormat()
 * Added SDL_CreateGPURenderer() and SDL_GetGPURendererDevice() to create a 2D renderer for use with GPU rendering.
 * Added SDL_CreateGPURenderState(), SDL_SetGPURenderStateFragmentUniforms(), SDL_SetGPURenderState(), and SDL_DestroyGPURenderState() to use fragment shaders with a GPU 2D renderer
 * Added SDL_PROP_TEXTURE_CREATE_GPU_TEXTURE_POINTER to create a 2D texture from an existing GPU texture
 * Added SDL_PROP_TEXTURE_GPU_TEXTURE_POINTER to get the GPU texture from a 2D texture when using the GPU 2D renderer
 * Added support for YUV textures and HDR colorspaces to the GPU 2D renderer
 * Added support for textures with palettes, and SDL_GetTexturePalette() and SDL_SetTexturePalette() to interact with them
 * Added SDL_RenderTexture9GridTiled() to do tiled instead of stretched 9-grid texture rendering
 * Added SDL_GetDefaultTextureScaleMode() and SDL_SetDefaultTextureScaleMode() to set the texture scale mode for new textures
 * Added SDL_GetRenderTextureAddressMode() and SDL_SetRenderTextureAddressMode() to change the texture addressing mode
 * Added SDL_TEXTURE_ADDRESS_WRAP to allow wrapping of textures if the renderer has SDL_PROP_RENDERER_TEXTURE_WRAPPING_BOOLEAN set
 * The default YUV colorspace is BT.601 limited range, for compatibility with SDL2
 * Added SDL_SCALEMODE_PIXELART as an improved scaling algorithm for pixel art without introducing blurring
 * Added SDL_FLIP_HORIZONTAL_AND_VERTICAL to flip a surface both horizontally and vertically
 * Added SDL_LoadPNG(), SDL_LoadPNG_IO(), SDL_SavePNG(), and SDL_SavePNG_IO() to load and save PNG images
 * Added SDL_LoadSurface() and SDL_LoadSurface_IO() to detect BMP and PNG formats and load them as surfaces
 * Added SDL_PROP_SURFACE_ROTATION_FLOAT to indicate the rotation needed to display camera images upright
 * Added SDL_RotateSurface() to create a rotated copy of a surface
 * SDL_EVENT_WINDOW_EXPOSED now sets data1 to true if it is sent during live resizing
 * Added SDL_EVENT_DISPLAY_USABLE_BOUNDS_CHANGED, which is sent when the usable desktop bounds change
 * Added SDL_EVENT_SCREEN_KEYBOARD_SHOWN, which is sent when the on-screen keyboard has been shown
 * Added SDL_EVENT_SCREEN_KEYBOARD_HIDDEN, which is sent when the on-screen keyboard has been hidden
 * Added pinch gesture events: SDL_EVENT_PINCH_BEGIN, SDL_EVENT_PINCH_UPDATE, SDL_EVENT_PINCH_END
 * SDL_EVENT_AUDIO_DEVICE_ADDED will be sent during initialization for each audio device
 * SDL_GetCameraPermissionState() returns SDL_CameraPermissionState instead of int
 * Added SDL_PutAudioStreamDataNoCopy() to do more efficient audio stream processing in some cases
 * Added SDL_PutAudioStreamPlanarData() to add planar audio data instead of interleaved data to an audio stream
 * Added SDL_HINT_AUDIO_DEVICE_RAW_STREAM to signal that the OS shouldn't do further audio processing, useful for applications that handle noise canceling, etc.
 * Added SDL_PROP_AUDIOSTREAM_AUTO_CLEANUP_BOOLEAN to allow streams that persist beyond the audio subsystem lifetime.
 * Added enhanced support for 8BitDo controllers
 * Added enhanced support for FlyDigi controllers
 * Added enhanced support for Hand Held Legend SInput controllers
 * Added support for wired Nintendo Switch 2 controllers when built with libusb
 * Added SDL_hid_get_properties() to associate SDL properties with HID devices
 * Added SDL_PROP_HIDAPI_LIBUSB_DEVICE_HANDLE_POINTER to query the libusb handle from an SDL_hid_device, if it's been opened with libusb
 * Added SDL_SetRelativeMouseTransform() to add custom mouse input transformation
 * Added SDL_GetPenDeviceType() to determine whether a pen is on the screen or on a separate touchpad
 * SDL_HINT_MAIN_CALLBACK_RATE may be set to a floating point callback rate
 * Added SDL_GetEventDescription() to get an English description of an event, suitable for logging
 * Added SDL_PROP_IOSTREAM_MEMORY_FREE_FUNC_POINTER to allow custom freeing of the memory used by SDL_IOFromMem() and SDL_IOFromConstMem()
 * Added SDL_PROP_PROCESS_CREATE_WORKING_DIRECTORY_STRING to set the working directory for new processes
 * Added verbose log output when the DEBUG_INVOCATION environment variable is set to "1"
 * Added SDL_AddAtomicU32()
 * Added SDL_GetSystemPageSize() to get the system page size
 * Added SDL_ALIGNED() to signal that data should have a specific alignment
 Windows:
 * Added SDL_HINT_RENDER_DIRECT3D11_WARP to enable D3D11 software rasterization
 * Using SDL_InsertGPUDebugLabel(), SDL_PushGPUDebugGroup(), and SDL_PopGPUDebugGroup() requires WinPixEventRuntime.dll to be in your PATH or in the same directory as your executable
 * Added SDL_PROP_DISPLAY_WINDOWS_HMONITOR_POINTER so you can query the HMONITOR associated with a display
 * SDL_HINT_AUDIO_DEVICE_STREAM_ROLE is used by the WASAPI audio driver to set the audio stream category
 * Added SDL_HINT_AUDIO_DEVICE_RAW_STREAM to signal whether the OS audio driver should do additional signal processing
 * Added SDL_HINT_WINDOWS_RAW_KEYBOARD_EXCLUDE_HOTKEYS to allow disabling some system hotkeys when in raw input mode
 * SDL_HINT_WINDOWS_GAMEINPUT is disabled by default
 macOS:
 * Added SDL_HINT_MAC_PRESS_AND_HOLD to control whether holding down a key will repeat the pressed key or open the accents menu
 Linux:
 * Added atomic support for KMSDRM
 * Added SDL_HINT_KMSDRM_ATOMIC to control whether KMSDRM will use atomic functionality
 * Added SDL_PROP_DISPLAY_WAYLAND_WL_OUTPUT_POINTER so you can query the wl_output associated with a display
 Emscripten:
 * Added SDL_WINDOW_FILL_DOCUMENT to indicate that windows expand to fill the whole browser window
 * Added SDL_SetWindowFillDocument() to change whether windows expand to fill the whole browser window
 * Added SDL_PROP_WINDOW_CREATE_EMSCRIPTEN_CANVAS_ID_STRING to allow setting the SDL canvas ID, and SDL_PROP_WINDOW_EMSCRIPTEN_CANVAS_ID_STRING to query it on existing windows
 * Added SDL_PROP_WINDOW_CREATE_EMSCRIPTEN_KEYBOARD_ELEMENT_STRING to specify where keyboard input is bound, and SDL_PROP_WINDOW_EMSCRIPTEN_KEYBOARD_ELEMENT_STRING to query it on existing windows
 iOS:
 * SDL now supports window scenes, fixing the warning "CLIENT OF UIKIT REQUIRES UPDATE"
 * Added SDL_PROP_WINDOW_CREATE_WINDOWSCENE_POINTER to specify the window scene for a window
 visionOS:
 * The default refresh rate has been increased to 90Hz
 * SDL_SetWindowSize() changes the size of the window on Vision Pro headsets
 PlayStation 2:
 * Added the following hints to control the display parameters: SDL_HINT_PS2_GS_WIDTH, SDL_HINT_PS2_GS_HEIGHT, SDL_HINT_PS2_GS_PROGRESSIVE, SDL_HINT_PS2_GS_MODE
 Note: On Unix platforms SDL provides ELF notes describing its non-mandatory library dependencies in the format described by https://systemd.io/ELF_DLOPEN_METADATA/. Some of these libraries are quite important, so distribution vendors who package SDL should parse the ELF notes and consider generating dependencies at the packaging level, for example by using https://github.com/systemd/package-notes. Other libraries and games can add similar ELF notes to describe their own dependencies by using the SDL_ELF_NOTE_DLOPEN macro.
 ---------------------------------------------------------------------------
 3.2.22:
 ---------------------------------------------------------------------------
 * SDL_HINT_JOYSTICK_WGI is disabled by default
 ---------------------------------------------------------------------------
 3.2.16:
 ---------------------------------------------------------------------------
 * SDL_HINT_JOYSTICK_RAWINPUT is disabled by default
 ---------------------------------------------------------------------------
 3.2.10:
 ---------------------------------------------------------------------------
 * Added SDL_HINT_VIDEO_X11_EXTERNAL_WINDOW_INPUT to control whether XSelectInput() should be called on external windows to enable input events.
 ---------------------------------------------------------------------------
 3.2.4:
 ---------------------------------------------------------------------------
 * Added SDL_StretchSurface()
 ---------------------------------------------------------------------------
 3.2.0:
 ---------------------------------------------------------------------------
--- a/Xcode/SDL/Info-Framework.plist
+++ b/Xcode/SDL/Info-Framework.plist
@@ -19,10 +19,10 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.4.0</string>
+	<string>3.2.28</string>
 	<key>CFBundleSignature</key>
 	<string>SDLX</string>
 	<key>CFBundleVersion</key>
-	<string>3.4.0</string>
+	<string>3.2.28</string>
 </dict>
 </plist>
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 55;
+	objectVersion = 54;
 	objects = {
 /* Begin PBXAggregateTarget section */
@@ -54,7 +54,6 @@
 		00CFA89D106B4BA100758660 /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00CFA89C106B4BA100758660 /* ForceFeedback.framework */; platformFilters = (macos, ); };
 		00D0D08410675DD9004B05EF /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00D0D08310675DD9004B05EF /* CoreFoundation.framework */; platformFilters = (ios, maccatalyst, macos, tvos, ); settings = {ATTRIBUTES = (Required, ); }; };
 		00D0D0D810675E46004B05EF /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 007317C10858E15000B2BC32 /* Carbon.framework */; platformFilters = (macos, ); };
 		02D6A1C228A84B8F00A7F002 /* SDL_hidapi_sinput.c in Sources */ = {isa = PBXBuildFile; fileRef = 02D6A1C128A84B8F00A7F001 /* SDL_hidapi_sinput.c */; };
 		1485C3312BBA4AF30063985B /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1485C32F2BBA4A0C0063985B /* UniformTypeIdentifiers.framework */; platformFilters = (maccatalyst, macos, ); settings = {ATTRIBUTES = (Weak, ); }; };
 		557D0CFA254586CA003913E3 /* CoreHaptics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F37DC5F225350EBC0002E6F7 /* CoreHaptics.framework */; platformFilters = (ios, maccatalyst, macos, tvos, ); settings = {ATTRIBUTES = (Weak, ); }; };
 		557D0CFB254586D7003913E3 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A75FDABD23E28B6200529352 /* GameController.framework */; settings = {ATTRIBUTES = (Required, ); }; };
@@ -67,16 +66,11 @@
 		566E26D8246274CC00718109 /* SDL_locale.c in Sources */ = {isa = PBXBuildFile; fileRef = 566E26CD246274CB00718109 /* SDL_locale.c */; };
 		566E26E1246274CC00718109 /* SDL_syslocale.h in Headers */ = {isa = PBXBuildFile; fileRef = 566E26CE246274CC00718109 /* SDL_syslocale.h */; };
 		56A2373329F9C113003CCA5F /* SDL_sysrwlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 56A2373229F9C113003CCA5F /* SDL_sysrwlock.c */; };
 		63124A422E5C357500A53610 /* SDL_hidapi_zuiki.c in Sources */ = {isa = PBXBuildFile; fileRef = 63124A412E5C357500A53610 /* SDL_hidapi_zuiki.c */; };
 		6312C66D2B42341400A7BB00 /* SDL_murmur3.c in Sources */ = {isa = PBXBuildFile; fileRef = 6312C66C2B42341400A7BB00 /* SDL_murmur3.c */; };
 		63134A252A7902FD0021E9A6 /* SDL_pen_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 63134A232A7902FD0021E9A6 /* SDL_pen_c.h */; };
 		63134A262A7902FD0021E9A6 /* SDL_pen.c in Sources */ = {isa = PBXBuildFile; fileRef = 63134A242A7902FD0021E9A6 /* SDL_pen.c */; };
 		75E0915A241EA924004729E1 /* SDL_virtualjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = 75E09158241EA924004729E1 /* SDL_virtualjoystick.c */; };
 		75E09163241EA924004729E1 /* SDL_virtualjoystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 75E09159241EA924004729E1 /* SDL_virtualjoystick_c.h */; };
 		89E5801E2D03602200DAF6D3 /* SDL_hidapi_lg4ff.c in Sources */ = {isa = PBXBuildFile; fileRef = 89E5801D2D03602200DAF6D3 /* SDL_hidapi_lg4ff.c */; };
 		89E580232D03606400DAF6D3 /* SDL_hidapihaptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 89E5801F2D03606400DAF6D3 /* SDL_hidapihaptic.c */; };
 		89E580242D03606400DAF6D3 /* SDL_hidapihaptic_lg4ff.c in Sources */ = {isa = PBXBuildFile; fileRef = 89E580212D03606400DAF6D3 /* SDL_hidapihaptic_lg4ff.c */; };
 		89E580252D03606400DAF6D3 /* SDL_hidapihaptic_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 89E580202D03606400DAF6D3 /* SDL_hidapihaptic_c.h */; };
 		9846B07C287A9020000C35C8 /* SDL_hidapi_shield.c in Sources */ = {isa = PBXBuildFile; fileRef = 9846B07B287A9020000C35C8 /* SDL_hidapi_shield.c */; };
 		A1626A3E2617006A003F1973 /* SDL_triangle.c in Sources */ = {isa = PBXBuildFile; fileRef = A1626A3D2617006A003F1973 /* SDL_triangle.c */; };
 		A1626A522617008D003F1973 /* SDL_triangle.h in Headers */ = {isa = PBXBuildFile; fileRef = A1626A512617008C003F1973 /* SDL_triangle.h */; };
@@ -230,7 +224,6 @@
 		A7D8B54523E2514300DCD162 /* SDL_hidapijoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7C423E2513E00DCD162 /* SDL_hidapijoystick.c */; };
 		A7D8B54B23E2514300DCD162 /* SDL_hidapi_xboxone.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7C523E2513E00DCD162 /* SDL_hidapi_xboxone.c */; };
 		A7D8B55123E2514300DCD162 /* SDL_hidapi_switch.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7C623E2513E00DCD162 /* SDL_hidapi_switch.c */; };
 		A7D8B55123E2514300DCD163 /* SDL_hidapi_switch2.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7C623E2513E00DCD163 /* SDL_hidapi_switch2.c */; };
 		A7D8B55723E2514300DCD162 /* SDL_hidapijoystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A7C723E2513E00DCD162 /* SDL_hidapijoystick_c.h */; };
 		A7D8B55D23E2514300DCD162 /* SDL_hidapi_xbox360w.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7C823E2513E00DCD162 /* SDL_hidapi_xbox360w.c */; };
 		A7D8B56323E2514300DCD162 /* SDL_hidapi_gamecube.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A7C923E2513E00DCD162 /* SDL_hidapi_gamecube.c */; };
@@ -288,6 +281,7 @@
 		A7D8B9E323E2514400DCD162 /* SDL_drawline.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A8F123E2514000DCD162 /* SDL_drawline.c */; };
 		A7D8B9E923E2514400DCD162 /* SDL_blendline.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8F223E2514000DCD162 /* SDL_blendline.h */; };
 		A7D8B9EF23E2514400DCD162 /* SDL_drawpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8F323E2514000DCD162 /* SDL_drawpoint.h */; };
 		A7D8B9F523E2514400DCD162 /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A8F423E2514000DCD162 /* SDL_rotate.c */; };
 		A7D8B9FB23E2514400DCD162 /* SDL_render_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8F523E2514000DCD162 /* SDL_render_sw_c.h */; };
 		A7D8BA0123E2514400DCD162 /* SDL_blendfillrect.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8F623E2514000DCD162 /* SDL_blendfillrect.h */; };
 		A7D8BA0723E2514400DCD162 /* SDL_drawline.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8F723E2514000DCD162 /* SDL_drawline.h */; };
@@ -297,6 +291,7 @@
 		A7D8BA1F23E2514400DCD162 /* SDL_blendline.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A8FB23E2514000DCD162 /* SDL_blendline.c */; };
 		A7D8BA2523E2514400DCD162 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A8FC23E2514000DCD162 /* SDL_drawpoint.c */; };
 		A7D8BA2B23E2514400DCD162 /* SDL_blendfillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A8FD23E2514000DCD162 /* SDL_blendfillrect.c */; };
 		A7D8BA3123E2514400DCD162 /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A8FE23E2514000DCD162 /* SDL_rotate.h */; };
 		A7D8BA4923E2514400DCD162 /* SDL_render_gles2.c in Sources */ = {isa = PBXBuildFile; fileRef = A7D8A90423E2514000DCD162 /* SDL_render_gles2.c */; };
 		A7D8BA4F23E2514400DCD162 /* SDL_shaders_gles2.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A90523E2514000DCD162 /* SDL_shaders_gles2.h */; };
 		A7D8BA5523E2514400DCD162 /* SDL_gles2funcs.h in Headers */ = {isa = PBXBuildFile; fileRef = A7D8A90623E2514000DCD162 /* SDL_gles2funcs.h */; };
@@ -388,7 +383,6 @@
 		F32DDAD42AB795A30041EAA5 /* SDL_audioresample.c in Sources */ = {isa = PBXBuildFile; fileRef = F32DDACE2AB795A30041EAA5 /* SDL_audioresample.c */; };
 		F338A1182D1B37D8007CDFDF /* SDL_tray.m in Sources */ = {isa = PBXBuildFile; fileRef = F338A1172D1B37D8007CDFDF /* SDL_tray.m */; };
 		F338A11A2D1B37E4007CDFDF /* SDL_tray.c in Sources */ = {isa = PBXBuildFile; fileRef = F338A1192D1B37E4007CDFDF /* SDL_tray.c */; };
 		F3395BA82D9A5971007246C8 /* SDL_hidapi_8bitdo.c in Sources */ = {isa = PBXBuildFile; fileRef = F3395BA72D9A5971007246C8 /* SDL_hidapi_8bitdo.c */; };
 		F34400342D40217A003F26D7 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = F373DA182D388A1E002158FA /* LICENSE.txt */; };
 		F34400362D40217A003F26D7 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = F373DA192D388A1E002158FA /* README.md */; };
 		F344003D2D4022E1003F26D7 /* INSTALL.md in Resources */ = {isa = PBXBuildFile; fileRef = F344003C2D4022E1003F26D7 /* INSTALL.md */; };
@@ -414,8 +408,6 @@
 		F386F6F02884663E001840AA /* SDL_utils_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F386F6E52884663E001840AA /* SDL_utils_c.h */; };
 		F386F6F92884663E001840AA /* SDL_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = F386F6E62884663E001840AA /* SDL_utils.c */; };
 		F388C95528B5F6F700661ECF /* SDL_hidapi_ps3.c in Sources */ = {isa = PBXBuildFile; fileRef = F388C95428B5F6F600661ECF /* SDL_hidapi_ps3.c */; };
 		F38C72492CEEB1DE000B0A90 /* SDL_hidapi_steam_triton.c in Sources */ = {isa = PBXBuildFile; fileRef = F38C72482CEEB1DE000B0A90 /* SDL_hidapi_steam_triton.c */; };
 		F39344CE2E99771B0056986F /* SDL_dlopennote.h in Headers */ = {isa = PBXBuildFile; fileRef = F39344CD2E99771B0056986F /* SDL_dlopennote.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		F395BF6525633B2400942BFF /* SDL_crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = F395BF6425633B2400942BFF /* SDL_crc32.c */; };
 		F395C1932569C68F00942BFF /* SDL_iokitjoystick_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F395C1912569C68E00942BFF /* SDL_iokitjoystick_c.h */; };
 		F395C19C2569C68F00942BFF /* SDL_iokitjoystick.c in Sources */ = {isa = PBXBuildFile; fileRef = F395C1922569C68E00942BFF /* SDL_iokitjoystick.c */; };
@@ -440,7 +432,6 @@
 		F3B439532C935C2C00792030 /* SDL_posixprocess.c in Sources */ = {isa = PBXBuildFile; fileRef = F3B439522C935C2C00792030 /* SDL_posixprocess.c */; };
 		F3B439562C937DAB00792030 /* SDL_process.c in Sources */ = {isa = PBXBuildFile; fileRef = F3B439542C937DAB00792030 /* SDL_process.c */; };
 		F3B439572C937DAB00792030 /* SDL_sysprocess.h in Headers */ = {isa = PBXBuildFile; fileRef = F3B439552C937DAB00792030 /* SDL_sysprocess.h */; };
 		F3B6B80A2DC3EA54004954FD /* SDL_hidapi_gip.c in Sources */ = {isa = PBXBuildFile; fileRef = F3B6B8092DC3EA54004954FD /* SDL_hidapi_gip.c */; };
 		F3C1BD752D1F1A3000846529 /* SDL_tray_utils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C1BD742D1F1A3000846529 /* SDL_tray_utils.c */; };
 		F3C1BD762D1F1A3000846529 /* SDL_tray_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C1BD732D1F1A3000846529 /* SDL_tray_utils.h */; };
 		F3C2CB222C5DDDB2004D7998 /* SDL_categories_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3C2CB202C5DDDB2004D7998 /* SDL_categories_c.h */; };
@@ -522,18 +513,10 @@
 		F3D60A8328C16A1900788A3A /* SDL_hidapi_wii.c in Sources */ = {isa = PBXBuildFile; fileRef = F3D60A8228C16A1800788A3A /* SDL_hidapi_wii.c */; };
 		F3D8BDFC2D6D2C7000B22FA1 /* SDL_eventwatch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3D8BDFB2D6D2C7000B22FA1 /* SDL_eventwatch_c.h */; };
 		F3D8BDFD2D6D2C7000B22FA1 /* SDL_eventwatch.c in Sources */ = {isa = PBXBuildFile; fileRef = F3D8BDFA2D6D2C7000B22FA1 /* SDL_eventwatch.c */; };
 		F3DB66342EA9ACC300568044 /* SDL_rotate.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DB66332EA9ACC300568044 /* SDL_rotate.c */; };
 		F3DB66352EA9ACC300568044 /* SDL_rotate.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DB66322EA9ACC300568044 /* SDL_rotate.h */; };
 		F3DC38C92E5FC60300CD73DE /* SDL_libusb.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DC38C72E5FC60300CD73DE /* SDL_libusb.h */; };
 		F3DC38CA2E5FC60300CD73DE /* SDL_libusb.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DC38C82E5FC60300CD73DE /* SDL_libusb.c */; };
 		F3DDCC562AFD42B600B0842B /* SDL_clipboard_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DDCC4D2AFD42B500B0842B /* SDL_clipboard_c.h */; };
 		F3DDCC5B2AFD42B600B0842B /* SDL_video_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DDCC522AFD42B600B0842B /* SDL_video_c.h */; };
 		F3DDCC5D2AFD42B600B0842B /* SDL_rect_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = F3DDCC542AFD42B600B0842B /* SDL_rect_impl.h */; };
 		F3E5A6EB2AD5E0E600293D83 /* SDL_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = F3E5A6EA2AD5E0E600293D83 /* SDL_properties.c */; };
 		F3E6C3932EE9F20000A6B39E /* SDL_report_descriptor.c in Sources */ = {isa = PBXBuildFile; fileRef = F3E6C3922EE9F20000A6B39E /* SDL_report_descriptor.c */; };
 		F3E6C3942EE9F20000A6B39E /* SDL_hidapi_flydigi.h in Headers */ = {isa = PBXBuildFile; fileRef = F3E6C38F2EE9F20000A6B39E /* SDL_hidapi_flydigi.h */; };
 		F3E6C3952EE9F20000A6B39E /* SDL_hidapi_sinput.h in Headers */ = {isa = PBXBuildFile; fileRef = F3E6C3902EE9F20000A6B39E /* SDL_hidapi_sinput.h */; };
 		F3E6C3962EE9F20000A6B39E /* SDL_report_descriptor.h in Headers */ = {isa = PBXBuildFile; fileRef = F3E6C3912EE9F20000A6B39E /* SDL_report_descriptor.h */; };
 		F3EFA5ED2D5AB97300BCF22F /* SDL_stb_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3EFA5EA2D5AB97300BCF22F /* SDL_stb_c.h */; };
 		F3EFA5EE2D5AB97300BCF22F /* stb_image.h in Headers */ = {isa = PBXBuildFile; fileRef = F3EFA5EC2D5AB97300BCF22F /* stb_image.h */; };
 		F3EFA5EF2D5AB97300BCF22F /* SDL_surface_c.h in Headers */ = {isa = PBXBuildFile; fileRef = F3EFA5EB2D5AB97300BCF22F /* SDL_surface_c.h */; };
@@ -551,7 +534,6 @@
 		F3FA5A232B59ACE000FEAD97 /* yuv_rgb_lsx.c in Sources */ = {isa = PBXBuildFile; fileRef = F3FA5A1A2B59ACE000FEAD97 /* yuv_rgb_lsx.c */; };
 		F3FA5A242B59ACE000FEAD97 /* yuv_rgb_lsx.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FA5A1B2B59ACE000FEAD97 /* yuv_rgb_lsx.h */; };
 		F3FA5A252B59ACE000FEAD97 /* yuv_rgb_common.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FA5A1C2B59ACE000FEAD97 /* yuv_rgb_common.h */; };
 		F3FBB1082DDF93AB0000F99F /* SDL_hidapi_flydigi.c in Sources */ = {isa = PBXBuildFile; fileRef = F3395BA72D9A5971007246C9 /* SDL_hidapi_flydigi.c */; };
 		F3FD042E2C9B755700824C4C /* SDL_hidapi_nintendo.h in Headers */ = {isa = PBXBuildFile; fileRef = F3FD042C2C9B755700824C4C /* SDL_hidapi_nintendo.h */; };
 		F3FD042F2C9B755700824C4C /* SDL_hidapi_steam_hori.c in Sources */ = {isa = PBXBuildFile; fileRef = F3FD042D2C9B755700824C4C /* SDL_hidapi_steam_hori.c */; };
 		FA73671D19A540EF004122E4 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA73671C19A540EF004122E4 /* CoreVideo.framework */; platformFilters = (ios, maccatalyst, macos, tvos, ); settings = {ATTRIBUTES = (Required, ); }; };
@@ -610,7 +592,6 @@
 		007317C10858E15000B2BC32 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		00CFA89C106B4BA100758660 /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = System/Library/Frameworks/ForceFeedback.framework; sourceTree = SDKROOT; };
 		00D0D08310675DD9004B05EF /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
 		02D6A1C128A84B8F00A7F001 /* SDL_hidapi_sinput.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_sinput.c; sourceTree = "<group>"; };
 		1485C32F2BBA4A0C0063985B /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
 		5616CA49252BB2A5005D5928 /* SDL_url.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_url.c; sourceTree = "<group>"; };
 		5616CA4A252BB2A6005D5928 /* SDL_sysurl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysurl.h; sourceTree = "<group>"; };
@@ -621,16 +602,11 @@
 		566E26CD246274CB00718109 /* SDL_locale.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_locale.c; path = locale/SDL_locale.c; sourceTree = "<group>"; };
 		566E26CE246274CC00718109 /* SDL_syslocale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_syslocale.h; path = locale/SDL_syslocale.h; sourceTree = "<group>"; };
 		56A2373229F9C113003CCA5F /* SDL_sysrwlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_sysrwlock.c; sourceTree = "<group>"; };
 		63124A412E5C357500A53610 /* SDL_hidapi_zuiki.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_zuiki.c; sourceTree = "<group>"; };
 		6312C66C2B42341400A7BB00 /* SDL_murmur3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_murmur3.c; sourceTree = "<group>"; };
 		63134A232A7902FD0021E9A6 /* SDL_pen_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_pen_c.h; sourceTree = "<group>"; };
 		63134A242A7902FD0021E9A6 /* SDL_pen.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_pen.c; sourceTree = "<group>"; };
 		75E09158241EA924004729E1 /* SDL_virtualjoystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_virtualjoystick.c; sourceTree = "<group>"; };
 		75E09159241EA924004729E1 /* SDL_virtualjoystick_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_virtualjoystick_c.h; sourceTree = "<group>"; };
 		89E5801D2D03602200DAF6D3 /* SDL_hidapi_lg4ff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_lg4ff.c; sourceTree = "<group>"; };
 		89E5801F2D03606400DAF6D3 /* SDL_hidapihaptic.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapihaptic.c; sourceTree = "<group>"; };
 		89E580202D03606400DAF6D3 /* SDL_hidapihaptic_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_hidapihaptic_c.h; sourceTree = "<group>"; };
 		89E580212D03606400DAF6D3 /* SDL_hidapihaptic_lg4ff.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapihaptic_lg4ff.c; sourceTree = "<group>"; };
 		9846B07B287A9020000C35C8 /* SDL_hidapi_shield.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_shield.c; sourceTree = "<group>"; };
 		A1626A3D2617006A003F1973 /* SDL_triangle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_triangle.c; sourceTree = "<group>"; };
 		A1626A512617008C003F1973 /* SDL_triangle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_triangle.h; sourceTree = "<group>"; };
@@ -823,7 +799,6 @@
 		A7D8A7C423E2513E00DCD162 /* SDL_hidapijoystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapijoystick.c; sourceTree = "<group>"; };
 		A7D8A7C523E2513E00DCD162 /* SDL_hidapi_xboxone.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_xboxone.c; sourceTree = "<group>"; };
 		A7D8A7C623E2513E00DCD162 /* SDL_hidapi_switch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_switch.c; sourceTree = "<group>"; };
 		A7D8A7C623E2513E00DCD163 /* SDL_hidapi_switch2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_switch2.c; sourceTree = "<group>"; };
 		A7D8A7C723E2513E00DCD162 /* SDL_hidapijoystick_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_hidapijoystick_c.h; sourceTree = "<group>"; };
 		A7D8A7C823E2513E00DCD162 /* SDL_hidapi_xbox360w.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_xbox360w.c; sourceTree = "<group>"; };
 		A7D8A7C923E2513E00DCD162 /* SDL_hidapi_gamecube.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_gamecube.c; sourceTree = "<group>"; };
@@ -882,6 +857,7 @@
 		A7D8A8F123E2514000DCD162 /* SDL_drawline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawline.c; sourceTree = "<group>"; };
 		A7D8A8F223E2514000DCD162 /* SDL_blendline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blendline.h; sourceTree = "<group>"; };
 		A7D8A8F323E2514000DCD162 /* SDL_drawpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_drawpoint.h; sourceTree = "<group>"; };
 		A7D8A8F423E2514000DCD162 /* SDL_rotate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = "<group>"; };
 		A7D8A8F523E2514000DCD162 /* SDL_render_sw_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_render_sw_c.h; sourceTree = "<group>"; };
 		A7D8A8F623E2514000DCD162 /* SDL_blendfillrect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blendfillrect.h; sourceTree = "<group>"; };
 		A7D8A8F723E2514000DCD162 /* SDL_drawline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_drawline.h; sourceTree = "<group>"; };
@@ -891,6 +867,7 @@
 		A7D8A8FB23E2514000DCD162 /* SDL_blendline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendline.c; sourceTree = "<group>"; };
 		A7D8A8FC23E2514000DCD162 /* SDL_drawpoint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawpoint.c; sourceTree = "<group>"; };
 		A7D8A8FD23E2514000DCD162 /* SDL_blendfillrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendfillrect.c; sourceTree = "<group>"; };
 		A7D8A8FE23E2514000DCD162 /* SDL_rotate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rotate.h; sourceTree = "<group>"; };
 		A7D8A90423E2514000DCD162 /* SDL_render_gles2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_render_gles2.c; sourceTree = "<group>"; };
 		A7D8A90523E2514000DCD162 /* SDL_shaders_gles2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_shaders_gles2.h; sourceTree = "<group>"; };
 		A7D8A90623E2514000DCD162 /* SDL_gles2funcs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gles2funcs.h; sourceTree = "<group>"; };
@@ -959,8 +936,6 @@
 		F32DDACE2AB795A30041EAA5 /* SDL_audioresample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_audioresample.c; sourceTree = "<group>"; };
 		F338A1172D1B37D8007CDFDF /* SDL_tray.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDL_tray.m; sourceTree = "<group>"; };
 		F338A1192D1B37E4007CDFDF /* SDL_tray.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_tray.c; sourceTree = "<group>"; };
 		F3395BA72D9A5971007246C8 /* SDL_hidapi_8bitdo.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_8bitdo.c; sourceTree = "<group>"; };
 		F3395BA72D9A5971007246C9 /* SDL_hidapi_flydigi.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_flydigi.c; sourceTree = "<group>"; };
 		F344003C2D4022E1003F26D7 /* INSTALL.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = INSTALL.md; sourceTree = "<group>"; };
 		F362B9152B3349E200D30B94 /* controller_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = controller_list.h; sourceTree = "<group>"; };
 		F362B9162B3349E200D30B94 /* SDL_gamepad_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_gamepad_c.h; sourceTree = "<group>"; };
@@ -1002,8 +977,6 @@
 		F386F6E52884663E001840AA /* SDL_utils_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_utils_c.h; sourceTree = "<group>"; };
 		F386F6E62884663E001840AA /* SDL_utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_utils.c; sourceTree = "<group>"; };
 		F388C95428B5F6F600661ECF /* SDL_hidapi_ps3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_ps3.c; sourceTree = "<group>"; };
 		F38C72482CEEB1DE000B0A90 /* SDL_hidapi_steam_triton.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_steam_triton.c; sourceTree = "<group>"; };
 		F39344CD2E99771B0056986F /* SDL_dlopennote.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_dlopennote.h; sourceTree = "<group>"; };
 		F395BF6425633B2400942BFF /* SDL_crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_crc32.c; sourceTree = "<group>"; };
 		F395C1912569C68E00942BFF /* SDL_iokitjoystick_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_iokitjoystick_c.h; sourceTree = "<group>"; };
 		F395C1922569C68E00942BFF /* SDL_iokitjoystick.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_iokitjoystick.c; sourceTree = "<group>"; };
@@ -1027,7 +1000,6 @@
 		F3B439522C935C2C00792030 /* SDL_posixprocess.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_posixprocess.c; sourceTree = "<group>"; };
 		F3B439542C937DAB00792030 /* SDL_process.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_process.c; sourceTree = "<group>"; };
 		F3B439552C937DAB00792030 /* SDL_sysprocess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysprocess.h; sourceTree = "<group>"; };
 		F3B6B8092DC3EA54004954FD /* SDL_hidapi_gip.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_gip.c; sourceTree = "<group>"; };
 		F3C1BD732D1F1A3000846529 /* SDL_tray_utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_tray_utils.h; sourceTree = "<group>"; };
 		F3C1BD742D1F1A3000846529 /* SDL_tray_utils.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_tray_utils.c; sourceTree = "<group>"; };
 		F3C2CB202C5DDDB2004D7998 /* SDL_categories_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_categories_c.h; sourceTree = "<group>"; };
@@ -1109,18 +1081,10 @@
 		F3D60A8228C16A1800788A3A /* SDL_hidapi_wii.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_hidapi_wii.c; sourceTree = "<group>"; };
 		F3D8BDFA2D6D2C7000B22FA1 /* SDL_eventwatch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_eventwatch.c; sourceTree = "<group>"; };
 		F3D8BDFB2D6D2C7000B22FA1 /* SDL_eventwatch_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_eventwatch_c.h; sourceTree = "<group>"; };
 		F3DB66322EA9ACC300568044 /* SDL_rotate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_rotate.h; sourceTree = "<group>"; };
 		F3DB66332EA9ACC300568044 /* SDL_rotate.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_rotate.c; sourceTree = "<group>"; };
 		F3DC38C72E5FC60300CD73DE /* SDL_libusb.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_libusb.h; sourceTree = "<group>"; };
 		F3DC38C82E5FC60300CD73DE /* SDL_libusb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_libusb.c; sourceTree = "<group>"; };
 		F3DDCC4D2AFD42B500B0842B /* SDL_clipboard_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_clipboard_c.h; sourceTree = "<group>"; };
 		F3DDCC522AFD42B600B0842B /* SDL_video_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_video_c.h; sourceTree = "<group>"; };
 		F3DDCC542AFD42B600B0842B /* SDL_rect_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_rect_impl.h; sourceTree = "<group>"; };
 		F3E5A6EA2AD5E0E600293D83 /* SDL_properties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_properties.c; sourceTree = "<group>"; };
 		F3E6C38F2EE9F20000A6B39E /* SDL_hidapi_flydigi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_hidapi_flydigi.h; sourceTree = "<group>"; };
 		F3E6C3902EE9F20000A6B39E /* SDL_hidapi_sinput.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_hidapi_sinput.h; sourceTree = "<group>"; };
 		F3E6C3912EE9F20000A6B39E /* SDL_report_descriptor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_report_descriptor.h; sourceTree = "<group>"; };
 		F3E6C3922EE9F20000A6B39E /* SDL_report_descriptor.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_report_descriptor.c; sourceTree = "<group>"; };
 		F3EFA5E92D5AB97300BCF22F /* SDL_stb.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = SDL_stb.c; sourceTree = "<group>"; };
 		F3EFA5EA2D5AB97300BCF22F /* SDL_stb_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_stb_c.h; sourceTree = "<group>"; };
 		F3EFA5EB2D5AB97300BCF22F /* SDL_surface_c.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SDL_surface_c.h; sourceTree = "<group>"; };
@@ -1277,7 +1241,6 @@
 				F3D46A8B2D20625800D9CBDF /* SDL_copying.h */,
 				F3D46A8C2D20625800D9CBDF /* SDL_cpuinfo.h */,
 				F3D46A8D2D20625800D9CBDF /* SDL_dialog.h */,
 				F39344CD2E99771B0056986F /* SDL_dlopennote.h */,
 				F3D46A8E2D20625800D9CBDF /* SDL_egl.h */,
 				F3D46A8F2D20625800D9CBDF /* SDL_endian.h */,
 				F3D46A902D20625800D9CBDF /* SDL_error.h */,
@@ -1431,8 +1394,6 @@
 			children = (
 				F3ADAB8C2576F08500A6B1D9 /* ios */,
 				5616CA48252BB285005D5928 /* macos */,
 				F3DC38C72E5FC60300CD73DE /* SDL_libusb.h */,
 				F3DC38C82E5FC60300CD73DE /* SDL_libusb.c */,
 				5616CA4A252BB2A6005D5928 /* SDL_sysurl.h */,
 				5616CA49252BB2A5005D5928 /* SDL_url.c */,
 			);
@@ -1514,16 +1475,6 @@
 			path = virtual;
 			sourceTree = "<group>";
 		};
 		89E580222D03606400DAF6D3 /* hidapi */ = {
 			isa = PBXGroup;
 			children = (
 				89E5801F2D03606400DAF6D3 /* SDL_hidapihaptic.c */,
 				89E580202D03606400DAF6D3 /* SDL_hidapihaptic_c.h */,
 				89E580212D03606400DAF6D3 /* SDL_hidapihaptic_lg4ff.c */,
 			);
 			path = hidapi;
 			sourceTree = "<group>";
 		};
 		A75FDAA423E2790500529352 /* ios */ = {
 			isa = PBXGroup;
 			children = (
@@ -1582,7 +1533,6 @@
 		A7D8A5C223E2513D00DCD162 /* haptic */ = {
 			isa = PBXGroup;
 			children = (
 				89E580222D03606400DAF6D3 /* hidapi */,
 				A7D8A5CD23E2513D00DCD162 /* darwin */,
 				A7D8A5C323E2513D00DCD162 /* dummy */,
 				A7D8A5C623E2513D00DCD162 /* SDL_haptic_c.h */,
@@ -1671,8 +1621,6 @@
 				F3DDCC542AFD42B600B0842B /* SDL_rect_impl.h */,
 				A7D8A61523E2513D00DCD162 /* SDL_RLEaccel.c */,
 				A7D8A76723E2513E00DCD162 /* SDL_RLEaccel_c.h */,
 				F3DB66322EA9ACC300568044 /* SDL_rotate.h */,
 				F3DB66332EA9ACC300568044 /* SDL_rotate.c */,
 				F3EFA5E92D5AB97300BCF22F /* SDL_stb.c */,
 				F3EFA5EA2D5AB97300BCF22F /* SDL_stb_c.h */,
 				A7D8A60323E2513D00DCD162 /* SDL_stretch.c */,
@@ -1954,13 +1902,8 @@
 		A7D8A7BE23E2513E00DCD162 /* hidapi */ = {
 			isa = PBXGroup;
 			children = (
 				F3395BA72D9A5971007246C8 /* SDL_hidapi_8bitdo.c */,
 				F32305FE28939F6400E66D30 /* SDL_hidapi_combined.c */,
 				F3E6C38F2EE9F20000A6B39E /* SDL_hidapi_flydigi.h */,
 				F3395BA72D9A5971007246C9 /* SDL_hidapi_flydigi.c */,
 				A7D8A7C923E2513E00DCD162 /* SDL_hidapi_gamecube.c */,
 				F3B6B8092DC3EA54004954FD /* SDL_hidapi_gip.c */,
 				89E5801D2D03602200DAF6D3 /* SDL_hidapi_lg4ff.c */,
 				F3F07D59269640160074468B /* SDL_hidapi_luna.c */,
 				F3FD042C2C9B755700824C4C /* SDL_hidapi_nintendo.h */,
 				F388C95428B5F6F600661ECF /* SDL_hidapi_ps3.c */,
@@ -1969,24 +1912,17 @@
 				A75FDBC323EA380300529352 /* SDL_hidapi_rumble.h */,
 				A75FDBC423EA380300529352 /* SDL_hidapi_rumble.c */,
 				9846B07B287A9020000C35C8 /* SDL_hidapi_shield.c */,
 				F3E6C3902EE9F20000A6B39E /* SDL_hidapi_sinput.h */,
 				02D6A1C128A84B8F00A7F001 /* SDL_hidapi_sinput.c */,
 				F3984CCF25BCC92800374F43 /* SDL_hidapi_stadia.c */,
 				A75FDAAC23E2795C00529352 /* SDL_hidapi_steam.c */,
 				F3FD042D2C9B755700824C4C /* SDL_hidapi_steam_hori.c */,
 				F38C72482CEEB1DE000B0A90 /* SDL_hidapi_steam_triton.c */,
 				A797456F2B2E9D39009D224A /* SDL_hidapi_steamdeck.c */,
 				A7D8A7C623E2513E00DCD162 /* SDL_hidapi_switch.c */,
 				A7D8A7C623E2513E00DCD163 /* SDL_hidapi_switch2.c */,
 				F3D60A8228C16A1800788A3A /* SDL_hidapi_wii.c */,
 				A7D8A7C223E2513E00DCD162 /* SDL_hidapi_xbox360.c */,
 				A7D8A7C823E2513E00DCD162 /* SDL_hidapi_xbox360w.c */,
 				A7D8A7C523E2513E00DCD162 /* SDL_hidapi_xboxone.c */,
 				63124A412E5C357500A53610 /* SDL_hidapi_zuiki.c */,
 				A7D8A7C423E2513E00DCD162 /* SDL_hidapijoystick.c */,
 				A7D8A7C723E2513E00DCD162 /* SDL_hidapijoystick_c.h */,
 				F3E6C3912EE9F20000A6B39E /* SDL_report_descriptor.h */,
 				F3E6C3922EE9F20000A6B39E /* SDL_report_descriptor.c */,
 			);
 			path = hidapi;
 			sourceTree = "<group>";
@@ -2237,6 +2173,8 @@
 				A7D8A8F323E2514000DCD162 /* SDL_drawpoint.h */,
 				A7D8A8F523E2514000DCD162 /* SDL_render_sw_c.h */,
 				A7D8A8F923E2514000DCD162 /* SDL_render_sw.c */,
 				A7D8A8F423E2514000DCD162 /* SDL_rotate.c */,
 				A7D8A8FE23E2514000DCD162 /* SDL_rotate.h */,
 			);
 			path = software;
 			sourceTree = "<group>";
@@ -2547,7 +2485,6 @@
 				A7D8AEEE23E2514100DCD162 /* SDL_cocoaopengles.h in Headers */,
 				F3D46ACA2D20625800D9CBDF /* SDL_storage.h in Headers */,
 				F3D46ACB2D20625800D9CBDF /* SDL_sensor.h in Headers */,
 				F3DB66352EA9ACC300568044 /* SDL_rotate.h in Headers */,
 				F3D46ACC2D20625800D9CBDF /* SDL_properties.h in Headers */,
 				F3D46ACD2D20625800D9CBDF /* SDL_bits.h in Headers */,
 				F3D46ACE2D20625800D9CBDF /* SDL_keyboard.h in Headers */,
@@ -2566,9 +2503,6 @@
 				F3D46ADB2D20625800D9CBDF /* SDL_pen.h in Headers */,
 				F3D46ADC2D20625800D9CBDF /* SDL_render.h in Headers */,
 				F3D46ADD2D20625800D9CBDF /* SDL_assert.h in Headers */,
 				F3E6C3942EE9F20000A6B39E /* SDL_hidapi_flydigi.h in Headers */,
 				F3E6C3952EE9F20000A6B39E /* SDL_hidapi_sinput.h in Headers */,
 				F3E6C3962EE9F20000A6B39E /* SDL_report_descriptor.h in Headers */,
 				F3D46ADE2D20625800D9CBDF /* SDL_atomic.h in Headers */,
 				F3D46ADF2D20625800D9CBDF /* SDL_begin_code.h in Headers */,
 				F3D46AE02D20625800D9CBDF /* SDL_log.h in Headers */,
@@ -2680,7 +2614,6 @@
 				F37E18642BAA40670098C111 /* SDL_time_c.h in Headers */,
 				F31013C82C24E98200FBE946 /* SDL_keymap_c.h in Headers */,
 				63134A252A7902FD0021E9A6 /* SDL_pen_c.h in Headers */,
 				89E580252D03606400DAF6D3 /* SDL_hidapihaptic_c.h in Headers */,
 				F36C34312C0F876500991150 /* SDL_offscreenvulkan.h in Headers */,
 				A7D8B2C023E2514200DCD162 /* SDL_pixels_c.h in Headers */,
 				F37E18622BAA40090098C111 /* SDL_sysfilesystem.h in Headers */,
@@ -2688,6 +2621,7 @@
 				F3DDCC5D2AFD42B600B0842B /* SDL_rect_impl.h in Headers */,
 				A7D8B9FB23E2514400DCD162 /* SDL_render_sw_c.h in Headers */,
 				E4F257972C81903800FCEAFC /* SDL_sysgpu.h in Headers */,
 				A7D8BA3123E2514400DCD162 /* SDL_rotate.h in Headers */,
 				A7D8A98D23E2514000DCD162 /* SDL_sensor_c.h in Headers */,
 				A7D8BA7323E2514400DCD162 /* SDL_shaders_gl.h in Headers */,
 				A7D8BA4F23E2514400DCD162 /* SDL_shaders_gles2.h in Headers */,
@@ -2775,10 +2709,8 @@
 				A7D8B28A23E2514200DCD162 /* vulkan_xlib_xrandr.h in Headers */,
 				A7D8B3D423E2514300DCD162 /* yuv_rgb.h in Headers */,
 				F3FA5A252B59ACE000FEAD97 /* yuv_rgb_common.h in Headers */,
 				F39344CE2E99771B0056986F /* SDL_dlopennote.h in Headers */,
 				F3FA5A1D2B59ACE000FEAD97 /* yuv_rgb_internal.h in Headers */,
 				F3D8BDFC2D6D2C7000B22FA1 /* SDL_eventwatch_c.h in Headers */,
 				F3DC38C92E5FC60300CD73DE /* SDL_libusb.h in Headers */,
 				F3FA5A242B59ACE000FEAD97 /* yuv_rgb_lsx.h in Headers */,
 				F3FA5A1E2B59ACE000FEAD97 /* yuv_rgb_lsx_func.h in Headers */,
 				F3FA5A1F2B59ACE000FEAD97 /* yuv_rgb_sse.h in Headers */,
@@ -2898,7 +2830,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Build an xcframework with both device and simulator files for all platforms.\n# Adapted from an answer in\n# https://developer.apple.com/forums/thread/666335?answerId=685927022#685927022\n\nif [ \"$XCODE_VERSION_ACTUAL\" -lt 1100 ]\nthen\n    echo \"error: Building an xcframework requires Xcode 11 minimum.\"\n    exit 1\nfi\n\nFRAMEWORK_NAME=\"SDL3\"\nPROJECT_NAME=\"SDL\"\nSCHEME=\"SDL3\"\n\nMACOS_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-macosx.xcarchive\"\nIOS_SIMULATOR_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-iphonesimulator.xcarchive\"\nIOS_DEVICE_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-iphoneos.xcarchive\"\nTVOS_SIMULATOR_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-appletvsimulator.xcarchive\"\nTVOS_DEVICE_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-appletvos.xcarchive\"\n\nOUTPUT_DIR=\"./build/\"\n\n# macOS\nxcodebuild archive \\\n    ONLY_ACTIVE_ARCH=NO \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${MACOS_ARCHIVE_PATH} \\\n    -destination 'generic/platform=macOS,name=Any Mac' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n    \n# iOS simulator\nxcodebuild archive \\\n    ONLY_ACTIVE_ARCH=NO \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${IOS_SIMULATOR_ARCHIVE_PATH} \\\n    -destination 'generic/platform=iOS Simulator' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# iOS device\nxcodebuild archive \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${IOS_DEVICE_ARCHIVE_PATH} \\\n    -destination 'generic/platform=iOS' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# tvOS simulator\nxcodebuild archive \\\n    ONLY_ACTIVE_ARCH=NO \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${TVOS_SIMULATOR_ARCHIVE_PATH} \\\n    -destination 'generic/platform=tvOS Simulator' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# tvOS device\nxcodebuild archive \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${TVOS_DEVICE_ARCHIVE_PATH} \\\n    -destination 'generic/platform=tvOS' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# Clean-up any existing instance of this xcframework from the Products directory\nrm -rf \"${OUTPUT_DIR}${FRAMEWORK_NAME}.xcframework\"\n\n# Create final xcframework\nxcodebuild -create-xcframework \\\n    -framework \"${MACOS_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${MACOS_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${IOS_DEVICE_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${IOS_DEVICE_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${IOS_SIMULATOR_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -framework \"${TVOS_DEVICE_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${TVOS_DEVICE_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${TVOS_SIMULATOR_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -output ${OUTPUT_DIR}/${FRAMEWORK_NAME}.xcframework\n\n# Ensure git doesn't pick up on our Products folder. \nrm -rf ${OUTPUT_DIR}/.gitignore\necho \"*\" >> ${OUTPUT_DIR}/.gitignore\n";
+			shellScript = "# Build an xcframework with both device and simulator files for all platforms.\n# Adapted from an answer in\n# https://developer.apple.com/forums/thread/666335?answerId=685927022#685927022\n\nif [ \"$XCODE_VERSION_ACTUAL\" -lt 1100 ]\nthen\n    echo \"error: Building an xcframework requires Xcode 11 minimum.\"\n    exit 1\nfi\n\nFRAMEWORK_NAME=\"SDL3\"\nPROJECT_NAME=\"SDL\"\nSCHEME=\"SDL3\"\n\nMACOS_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-macosx.xcarchive\"\nIOS_SIMULATOR_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-iphonesimulator.xcarchive\"\nIOS_DEVICE_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-iphoneos.xcarchive\"\nTVOS_SIMULATOR_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-appletvsimulator.xcarchive\"\nTVOS_DEVICE_ARCHIVE_PATH=\"${BUILD_DIR}/${CONFIGURATION}/${FRAMEWORK_NAME}-appletvos.xcarchive\"\n\nOUTPUT_DIR=\"./build/\"\n\n# macOS\nxcodebuild archive \\\n    ONLY_ACTIVE_ARCH=NO \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${MACOS_ARCHIVE_PATH} \\\n    -destination 'generic/platform=macOS,name=Any Mac' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n    \n# iOS simulator\nxcodebuild archive \\\n    ONLY_ACTIVE_ARCH=NO \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${IOS_SIMULATOR_ARCHIVE_PATH} \\\n    -destination 'generic/platform=iOS Simulator' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# iOS device\nxcodebuild archive \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${IOS_DEVICE_ARCHIVE_PATH} \\\n    -destination 'generic/platform=iOS' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# tvOS simulator\nxcodebuild archive \\\n    ONLY_ACTIVE_ARCH=NO \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${TVOS_SIMULATOR_ARCHIVE_PATH} \\\n    -destination 'generic/platform=tvOS Simulator' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# tvOS device\nxcodebuild archive \\\n    -scheme \"${SCHEME}\" \\\n    -project \"${PROJECT_NAME}.xcodeproj\" \\\n    -archivePath ${TVOS_DEVICE_ARCHIVE_PATH} \\\n    -destination 'generic/platform=tvOS' \\\n    BUILD_LIBRARY_FOR_DISTRIBUTION=YES \\\n    SKIP_INSTALL=NO || exit $?\n\n# Clean-up any existing instance of this xcframework from the Products directory\nrm -rf \"${OUTPUT_DIR}${FRAMEWORK_NAME}.xcframework\"\n\n# Create final xcframework\nxcodebuild -create-xcframework \\\n    -framework \"${MACOS_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${MACOS_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${IOS_DEVICE_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${IOS_DEVICE_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${IOS_SIMULATOR_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${IOS_SIMULATOR_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${TVOS_DEVICE_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${TVOS_DEVICE_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -framework \"${TVOS_SIMULATOR_ARCHIVE_PATH}\"/Products/Library/Frameworks/${FRAMEWORK_NAME}.framework \\\n    -debug-symbols \"${TVOS_SIMULATOR_ARCHIVE_PATH}\"/dSYMs/$FRAMEWORK_NAME.framework.dSYM \\\n    -output ${OUTPUT_DIR}/${FRAMEWORK_NAME}.xcframework\n\n# Ensure git doesn't pick up on our Products folder. \nrm -rf ${OUTPUT_DIR}/.gitignore\necho \"*\" >> ${OUTPUT_DIR}/.gitignore\n";
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -2912,7 +2844,6 @@
 				A7D8B62F23E2514300DCD162 /* SDL_sysfilesystem.m in Sources */,
 				A7D8B41C23E2514300DCD162 /* SDL_systls.c in Sources */,
 				9846B07C287A9020000C35C8 /* SDL_hidapi_shield.c in Sources */,
 				02D6A1C228A84B8F00A7F002 /* SDL_hidapi_sinput.c in Sources */,
 				F31013C72C24E98200FBE946 /* SDL_keymap.c in Sources */,
 				F3A9AE992C8A13C100AAC390 /* SDL_render_gpu.c in Sources */,
 				A7D8BBD923E2574800DCD162 /* SDL_uikitmessagebox.m in Sources */,
@@ -2930,6 +2861,7 @@
 				A7D8AEC423E2514100DCD162 /* SDL_cocoaevents.m in Sources */,
 				E479118F2BA9555500CE3B7F /* SDL_genericstorage.c in Sources */,
 				A7D8B86623E2514400DCD162 /* SDL_audiocvt.c in Sources */,
 				A7D8B9F523E2514400DCD162 /* SDL_rotate.c in Sources */,
 				A7D8BBE323E2574800DCD162 /* SDL_uikitvideo.m in Sources */,
 				F338A1182D1B37D8007CDFDF /* SDL_tray.m in Sources */,
 				5616CA4E252BB2A6005D5928 /* SDL_sysurl.m in Sources */,
@@ -2938,7 +2870,6 @@
 				F3C1BD752D1F1A3000846529 /* SDL_tray_utils.c in Sources */,
 				F382071D284F362F004DD584 /* SDL_guid.c in Sources */,
 				A7D8BB8D23E2514500DCD162 /* SDL_touch.c in Sources */,
 				F3E6C3932EE9F20000A6B39E /* SDL_report_descriptor.c in Sources */,
 				F31A92D228D4CB39003BFD6A /* SDL_offscreenopengles.c in Sources */,
 				A1626A3E2617006A003F1973 /* SDL_triangle.c in Sources */,
 				A7D8B3F223E2514300DCD162 /* SDL_thread.c in Sources */,
@@ -2958,7 +2889,6 @@
 				E4F257962C81903800FCEAFC /* SDL_gpu.c in Sources */,
 				F3D60A8328C16A1900788A3A /* SDL_hidapi_wii.c in Sources */,
 				A7D8B9DD23E2514400DCD162 /* SDL_blendpoint.c in Sources */,
 				F3DB66342EA9ACC300568044 /* SDL_rotate.c in Sources */,
 				A7D8B4EE23E2514300DCD162 /* SDL_gamepad.c in Sources */,
 				E4A568B62AF763940062EEC4 /* SDL_sysmain_callbacks.c in Sources */,
 				F316ABD82B5C3185002EF551 /* SDL_memset.c in Sources */,
@@ -2971,8 +2901,6 @@
 				A7D8ADF223E2514100DCD162 /* SDL_blit_A.c in Sources */,
 				A7D8BBDD23E2574800DCD162 /* SDL_uikitmodes.m in Sources */,
 				F3A9AE9C2C8A13C100AAC390 /* SDL_pipeline_gpu.c in Sources */,
 				89E580232D03606400DAF6D3 /* SDL_hidapihaptic.c in Sources */,
 				89E580242D03606400DAF6D3 /* SDL_hidapihaptic_lg4ff.c in Sources */,
 				75E0915A241EA924004729E1 /* SDL_virtualjoystick.c in Sources */,
 				F338A11A2D1B37E4007CDFDF /* SDL_tray.c in Sources */,
 				A7D8ABEB23E2514100DCD162 /* SDL_nullvideo.c in Sources */,
@@ -3028,14 +2956,12 @@
 				F316ABD92B5C3185002EF551 /* SDL_memcpy.c in Sources */,
 				A7D8B97A23E2514400DCD162 /* SDL_render.c in Sources */,
 				A7D8ABD323E2514100DCD162 /* SDL_stretch.c in Sources */,
 				F38C72492CEEB1DE000B0A90 /* SDL_hidapi_steam_triton.c in Sources */,
 				A7D8AC3923E2514100DCD162 /* SDL_blit_copy.c in Sources */,
 				A7D8B5CF23E2514300DCD162 /* SDL_syspower.m in Sources */,
 				F3B439512C935C2400792030 /* SDL_dummyprocess.c in Sources */,
 				A7D8B76423E2514300DCD162 /* SDL_mixer.c in Sources */,
 				A7D8BB5723E2514500DCD162 /* SDL_events.c in Sources */,
 				A7D8ADE623E2514100DCD162 /* SDL_blit_0.c in Sources */,
 				89E5801E2D03602200DAF6D3 /* SDL_hidapi_lg4ff.c in Sources */,
 				A7D8B8A823E2514400DCD162 /* SDL_diskaudio.c in Sources */,
 				56A2373329F9C113003CCA5F /* SDL_sysrwlock.c in Sources */,
 				F3A9AE9A2C8A13C100AAC390 /* SDL_shaders_gpu.c in Sources */,
@@ -3072,7 +2998,6 @@
 				F3FA5A222B59ACE000FEAD97 /* yuv_rgb_sse.c in Sources */,
 				F3C2CB232C5DDDB2004D7998 /* SDL_categories.c in Sources */,
 				A7D8B55123E2514300DCD162 /* SDL_hidapi_switch.c in Sources */,
 				A7D8B55123E2514300DCD163 /* SDL_hidapi_switch2.c in Sources */,
 				A7D8B96223E2514400DCD162 /* SDL_strtokr.c in Sources */,
 				A7D8BB7523E2514500DCD162 /* SDL_clipboardevents.c in Sources */,
 				E4F798202AD8D87F00669F54 /* SDL_video_unsupported.c in Sources */,
@@ -3100,7 +3025,6 @@
 				A7D8BA5B23E2514400DCD162 /* SDL_shaders_gles2.c in Sources */,
 				A7D8B14023E2514200DCD162 /* SDL_blit_1.c in Sources */,
 				A7D8BBDB23E2574800DCD162 /* SDL_uikitmetalview.m in Sources */,
 				F3B6B80A2DC3EA54004954FD /* SDL_hidapi_gip.c in Sources */,
 				A7D8BB1523E2514500DCD162 /* SDL_mouse.c in Sources */,
 				F395C19C2569C68F00942BFF /* SDL_iokitjoystick.c in Sources */,
 				A7D8B4B223E2514300DCD162 /* SDL_sysjoystick.c in Sources */,
@@ -3123,15 +3047,12 @@
 				000028F8113A53F4333E0000 /* SDL_main_callbacks.c in Sources */,
 				000098E9DAA43EF6FF7F0000 /* SDL_camera.c in Sources */,
 				F310138E2C1F2CB700FBE946 /* SDL_random.c in Sources */,
 				F3395BA82D9A5971007246C8 /* SDL_hidapi_8bitdo.c in Sources */,
 				00001B2471F503DD3C1B0000 /* SDL_camera_dummy.c in Sources */,
 				00002B20A48E055EB0350000 /* SDL_camera_coremedia.m in Sources */,
 				000080903BC03006F24E0000 /* SDL_filesystem.c in Sources */,
 				F3FBB1082DDF93AB0000F99F /* SDL_hidapi_flydigi.c in Sources */,
 				0000481D255AF155B42C0000 /* SDL_sysfsops.c in Sources */,
 				0000494CC93F3E624D3C0000 /* SDL_systime.c in Sources */,
 				000095FA1BDE436CF3AF0000 /* SDL_time.c in Sources */,
 				F3DC38CA2E5FC60300CD73DE /* SDL_libusb.c in Sources */,
 				0000140640E77F73F1DF0000 /* SDL_dialog_utils.c in Sources */,
 				0000D5B526B85DE7AB1C0000 /* SDL_cocoapen.m in Sources */,
 				6312C66D2B42341400A7BB00 /* SDL_murmur3.c in Sources */,
@@ -3139,7 +3060,6 @@
 				00004D0B73767647AD550000 /* SDL_asyncio_generic.c in Sources */,
 				0000A03C0F32C43816F40000 /* SDL_asyncio_windows_ioring.c in Sources */,
 				0000A877C7DB9FA935FC0000 /* SDL_uikitpen.m in Sources */,
 				63124A422E5C357500A53610 /* SDL_hidapi_zuiki.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3161,8 +3081,8 @@
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				DEPLOYMENT_POSTPROCESSING = YES;
-				DYLIB_COMPATIBILITY_VERSION = 401.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 201.0.0;
-				DYLIB_CURRENT_VERSION = 401.0.0;
+				DYLIB_CURRENT_VERSION = 201.28.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_ALTIVEC_EXTENSIONS = YES;
@@ -3197,7 +3117,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.4.0;
+				MARKETING_VERSION = 3.2.28;
 				OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3;
 				PRODUCT_NAME = SDL3;
@@ -3205,7 +3125,7 @@
 				SUPPORTED_PLATFORMS = "xrsimulator xros macosx iphonesimulator iphoneos appletvsimulator appletvos";
 				SUPPORTS_MACCATALYST = YES;
 				TVOS_DEPLOYMENT_TARGET = 11.0;
-				XROS_DEPLOYMENT_TARGET = 1.3;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Release;
 		};
@@ -3227,8 +3147,8 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				DYLIB_COMPATIBILITY_VERSION = 401.0.0;
+				DYLIB_COMPATIBILITY_VERSION = 201.0.0;
-				DYLIB_CURRENT_VERSION = 401.0.0;
+				DYLIB_CURRENT_VERSION = 201.28.0;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -3260,7 +3180,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.4.0;
+				MARKETING_VERSION = 3.2.28;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = org.libsdl.SDL3;
@@ -3269,7 +3189,7 @@
 				SUPPORTED_PLATFORMS = "xrsimulator xros macosx iphonesimulator iphoneos appletvsimulator appletvos";
 				SUPPORTS_MACCATALYST = YES;
 				TVOS_DEPLOYMENT_TARGET = 11.0;
-				XROS_DEPLOYMENT_TARGET = 1.3;
+				XROS_DEPLOYMENT_TARGET = 1.0;
 			};
 			name = Debug;
 		};
--- a/Xcode/SDL/pkg-support/SDL.info
+++ b/Xcode/SDL/pkg-support/SDL.info
@@ -1,4 +1,4 @@
-Title SDL 3.4.0
+Title SDL 3.2.28
 Version 1
 Description SDL Library for macOS (http://www.libsdl.org)
 DefaultLocation /Library/Frameworks
--- a/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
+++ b/Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj
@@ -19,6 +19,7 @@
 				F35E56E72983133F00A43A5F /* PBXTargetDependency */,
 				DB0F490517CA5249008798C5 /* PBXTargetDependency */,
 				DB0F490717CA5249008798C5 /* PBXTargetDependency */,
 				DB166E9816A1D7CF00A1396C /* PBXTargetDependency */,
 				DB166E9616A1D7CD00A1396C /* PBXTargetDependency */,
 				DB166E6C16A1D72000A1396C /* PBXTargetDependency */,
 				DB166E5616A1D6B800A1396C /* PBXTargetDependency */,
@@ -87,6 +88,7 @@
 		00794EF009D23739003FC8A1 /* utf8.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6309D20839003FC8A1 /* utf8.txt */; };
 		00794EF709D237DE003FC8A1 /* moose.dat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5E09D20839003FC8A1 /* moose.dat */; };
 		453774A5120915E3002F0F45 /* testshape.c in Sources */ = {isa = PBXBuildFile; fileRef = 453774A4120915E3002F0F45 /* testshape.c */; };
 		66E88E8B203B778F0004D44E /* testyuv_cvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 66E88E8A203B778F0004D44E /* testyuv_cvt.c */; };
 		A1A8594E2BC72FC20045DD6C /* testautomation_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = A1A859482BC72FC20045DD6C /* testautomation_properties.c */; };
 		A1A859502BC72FC20045DD6C /* testautomation_subsystems.c in Sources */ = {isa = PBXBuildFile; fileRef = A1A859492BC72FC20045DD6C /* testautomation_subsystems.c */; };
 		A1A859522BC72FC20045DD6C /* testautomation_log.c in Sources */ = {isa = PBXBuildFile; fileRef = A1A8594A2BC72FC20045DD6C /* testautomation_log.c */; };
@@ -115,21 +117,23 @@
 		DB166D9F16A1D1A500A1396C /* SDL_test_log.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166D9016A1D1A500A1396C /* SDL_test_log.c */; };
 		DB166DA016A1D1A500A1396C /* SDL_test_md5.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166D9116A1D1A500A1396C /* SDL_test_md5.c */; };
 		DB166DD716A1D37800A1396C /* testmessage.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CBD16A1C74100A1396C /* testmessage.c */; };
-		DB166DDB16A1D42F00A1396C /* icon.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		DB166DDB16A1D42F00A1396C /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
 		DB166DF016A1D52500A1396C /* testrelative.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CBF16A1C74100A1396C /* testrelative.c */; };
 		DB166E0716A1D59400A1396C /* testrendercopyex.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC016A1C74100A1396C /* testrendercopyex.c */; };
 		DB166E1E16A1D5C300A1396C /* testrendertarget.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC116A1C74100A1396C /* testrendertarget.c */; };
-		DB166E2216A1D5EC00A1396C /* sample.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.png */; };
+		DB166E2216A1D5EC00A1396C /* sample.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.bmp */; };
-		DB166E2316A1D60B00A1396C /* icon.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		DB166E2316A1D60B00A1396C /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
-		DB166E2516A1D61900A1396C /* icon.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		DB166E2516A1D61900A1396C /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
-		DB166E2616A1D61900A1396C /* sample.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.png */; };
+		DB166E2616A1D61900A1396C /* sample.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.bmp */; };
 		DB166E3C16A1D66500A1396C /* testrumble.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC216A1C74100A1396C /* testrumble.c */; };
-		DB166E4D16A1D69000A1396C /* icon.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		DB166E4D16A1D69000A1396C /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
-		DB166E4E16A1D69000A1396C /* sample.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.png */; };
+		DB166E4E16A1D69000A1396C /* sample.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6109D20839003FC8A1 /* sample.bmp */; };
 		DB166E5416A1D6A300A1396C /* testscale.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC316A1C74100A1396C /* testscale.c */; };
 		DB166E6A16A1D70C00A1396C /* testshader.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC416A1C74100A1396C /* testshader.c */; };
 		DB166E9316A1D7BC00A1396C /* testspriteminimal.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC516A1C74100A1396C /* testspriteminimal.c */; };
-		DB166E9C16A1D80900A1396C /* icon.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		DB166E9416A1D7C700A1396C /* teststreaming.c in Sources */ = {isa = PBXBuildFile; fileRef = DB166CC616A1C74100A1396C /* teststreaming.c */; };
 		DB166E9A16A1D7F700A1396C /* moose.dat in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5E09D20839003FC8A1 /* moose.dat */; };
 		DB166E9C16A1D80900A1396C /* icon.bmp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
 		DB445EFB18184BB600B306B0 /* testdropfile.c in Sources */ = {isa = PBXBuildFile; fileRef = DB445EFA18184BB600B306B0 /* testdropfile.c */; };
 		DB89958418A19B130092407C /* testhotplug.c in Sources */ = {isa = PBXBuildFile; fileRef = DB89958318A19B130092407C /* testhotplug.c */; };
 		F35E56CF2983130F00A43A5F /* testautomation_main.c in Sources */ = {isa = PBXBuildFile; fileRef = F35E56B62983130A00A43A5F /* testautomation_main.c */; };
@@ -158,7 +162,6 @@
 		F36C34232C0F85DB00991150 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F36C342D2C0F869B00991150 /* testcamera.c in Sources */ = {isa = PBXBuildFile; fileRef = F36C342C2C0F869B00991150 /* testcamera.c */; };
 		F36C342E2C0F869B00991150 /* testcamera.c in Sources */ = {isa = PBXBuildFile; fileRef = F36C342C2C0F869B00991150 /* testcamera.c */; };
 		F38908B72E81276900CE01D5 /* testautomation_blit.c in Sources */ = {isa = PBXBuildFile; fileRef = F38908B42E81276900CE01D5 /* testautomation_blit.c */; };
 		F399C64E2A78929400C86979 /* gamepadutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F399C6492A78929400C86979 /* gamepadutils.c */; };
 		F399C64F2A78929400C86979 /* gamepadutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F399C6492A78929400C86979 /* gamepadutils.c */; };
 		F399C6512A7892D800C86979 /* testautomation_intrinsics.c in Sources */ = {isa = PBXBuildFile; fileRef = F399C6502A7892D800C86979 /* testautomation_intrinsics.c */; };
@@ -179,12 +182,13 @@
 		F3C17C8228E4112900E1A26D /* testutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17C7328E40ADE00E1A26D /* testutils.c */; };
 		F3C17C8328E4124400E1A26D /* testutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17C7328E40ADE00E1A26D /* testutils.c */; };
 		F3C17C8428E4126400E1A26D /* testutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17C7328E40ADE00E1A26D /* testutils.c */; };
 		F3C17C8528E4127D00E1A26D /* testutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17C7328E40ADE00E1A26D /* testutils.c */; };
 		F3C17CEB28E4177600E1A26D /* testgeometry.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17CD628E416AC00E1A26D /* testgeometry.c */; };
 		F3C17CEC28E417EB00E1A26D /* testutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17C7328E40ADE00E1A26D /* testutils.c */; };
 		F3C17D3928E424B800E1A26D /* sample.wav in Resources */ = {isa = PBXBuildFile; fileRef = 00794E6209D20839003FC8A1 /* sample.wav */; };
-		F3C17D3B28E4252900E1A26D /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		F3C17D3B28E4252900E1A26D /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
 		F3C2CAC62C5C8BD6004D7998 /* unifont-15.1.05.hex in Resources */ = {isa = PBXBuildFile; fileRef = F3C2CAC52C5C8BD6004D7998 /* unifont-15.1.05.hex */; };
-		F3C2CB072C5D3FB2004D7998 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.png */; };
+		F3C2CB072C5D3FB2004D7998 /* icon.bmp in Resources */ = {isa = PBXBuildFile; fileRef = 00794E5D09D20839003FC8A1 /* icon.bmp */; };
 		F3CB56892A7895F800766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
 		F3CB568A2A7895F800766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3CB568C2A7896BF00766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
@@ -263,6 +267,8 @@
 		F3CB56FB2A78983200766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3CB56FD2A78983C00766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
 		F3CB56FE2A78983C00766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3CB57002A78984300766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
 		F3CB57012A78984300766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3CB57032A78984A00766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
 		F3CB57042A78984A00766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3CB57062A78985400766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
@@ -273,12 +279,6 @@
 		F3CB570D2A78986000766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3CB570F2A78986700766177 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
 		F3CB57102A78986700766177 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3DB65DF2E9DA90000568044 /* testutils.c in Sources */ = {isa = PBXBuildFile; fileRef = F3C17C7328E40ADE00E1A26D /* testutils.c */; };
 		F3DB65E12E9DA90000568044 /* SDL3.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; };
 		F3DB65E52E9DA90000568044 /* SDL3.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 003FA643093FFD41000C53B3 /* SDL3.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		F3DB65EE2E9DA95D00568044 /* testyuv.png in Resources */ = {isa = PBXBuildFile; fileRef = F3DB65ED2E9DA95D00568044 /* testyuv.png */; };
 		F3DB65F12E9DA98E00568044 /* testyuv.c in Sources */ = {isa = PBXBuildFile; fileRef = F3DB65EF2E9DA98E00568044 /* testyuv.c */; };
 		F3DB65F22E9DA9B400568044 /* testyuv_cvt.c in Sources */ = {isa = PBXBuildFile; fileRef = 66E88E8A203B778F0004D44E /* testyuv_cvt.c */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -569,6 +569,13 @@
 			remoteGlobalIDString = DB166E6D16A1D78400A1396C;
 			remoteInfo = testspriteminimal;
 		};
 		DB166E9716A1D7CF00A1396C /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = DB166E8016A1D78C00A1396C;
 			remoteInfo = teststreaming;
 		};
 		F35E56E62983133F00A43A5F /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -636,7 +643,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
-				DB166DDB16A1D42F00A1396C /* icon.png in CopyFiles */,
+				DB166DDB16A1D42F00A1396C /* icon.bmp in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -646,8 +653,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
-				DB166E2316A1D60B00A1396C /* icon.png in CopyFiles */,
+				DB166E2316A1D60B00A1396C /* icon.bmp in CopyFiles */,
-				DB166E2216A1D5EC00A1396C /* sample.png in CopyFiles */,
+				DB166E2216A1D5EC00A1396C /* sample.bmp in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -657,8 +664,8 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
-				DB166E2516A1D61900A1396C /* icon.png in CopyFiles */,
+				DB166E2516A1D61900A1396C /* icon.bmp in CopyFiles */,
-				DB166E2616A1D61900A1396C /* sample.png in CopyFiles */,
+				DB166E2616A1D61900A1396C /* sample.bmp in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -668,8 +675,18 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
-				DB166E4D16A1D69000A1396C /* icon.png in CopyFiles */,
+				DB166E4D16A1D69000A1396C /* icon.bmp in CopyFiles */,
-				DB166E4E16A1D69000A1396C /* sample.png in CopyFiles */,
+				DB166E4E16A1D69000A1396C /* sample.bmp in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		DB166E9916A1D7EE00A1396C /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
 				DB166E9A16A1D7F700A1396C /* moose.dat in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -679,7 +696,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 7;
 			files = (
-				DB166E9C16A1D80900A1396C /* icon.png in CopyFiles */,
+				DB166E9C16A1D80900A1396C /* icon.bmp in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1143,6 +1160,17 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F3CB57022A78984300766177 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
 				F3CB57012A78984300766177 /* SDL3.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F3CB57052A78984A00766177 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1198,17 +1226,6 @@
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F3DB65E42E9DA90000568044 /* Embed Frameworks */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
 				F3DB65E52E9DA90000568044 /* SDL3.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
 /* Begin PBXFileReference section */
@@ -1252,9 +1269,10 @@
 		002F346A09CA204F00EBEB88 /* testplatform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testplatform.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		002F346F09CA20A600EBEB88 /* testplatform.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testplatform.c; sourceTree = "<group>"; };
 		003FA63A093FFD41000C53B3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../SDL/SDL.xcodeproj; sourceTree = SOURCE_ROOT; };
-		00794E5D09D20839003FC8A1 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = "<group>"; };
+		00794E5D09D20839003FC8A1 /* icon.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; path = icon.bmp; sourceTree = "<group>"; };
 		00794E5E09D20839003FC8A1 /* moose.dat */ = {isa = PBXFileReference; lastKnownFileType = file; path = moose.dat; sourceTree = "<group>"; };
-		00794E6109D20839003FC8A1 /* sample.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sample.png; sourceTree = "<group>"; };
+		00794E5F09D20839003FC8A1 /* picture.xbm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = picture.xbm; sourceTree = "<group>"; };
 		00794E6109D20839003FC8A1 /* sample.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; path = sample.bmp; sourceTree = "<group>"; };
 		00794E6209D20839003FC8A1 /* sample.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = sample.wav; sourceTree = "<group>"; };
 		00794E6309D20839003FC8A1 /* utf8.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = utf8.txt; sourceTree = "<group>"; };
 		083E4872006D84C97F000001 /* loopwave.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = loopwave.c; sourceTree = "<group>"; };
@@ -1300,6 +1318,7 @@
 		DB166CC316A1C74100A1396C /* testscale.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = testscale.c; sourceTree = "<group>"; };
 		DB166CC416A1C74100A1396C /* testshader.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = testshader.c; sourceTree = "<group>"; };
 		DB166CC516A1C74100A1396C /* testspriteminimal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = testspriteminimal.c; sourceTree = "<group>"; };
 		DB166CC616A1C74100A1396C /* teststreaming.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = teststreaming.c; sourceTree = "<group>"; };
 		DB166D7F16A1D12400A1396C /* libSDL3_test.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSDL3_test.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		DB166D8416A1D1A500A1396C /* SDL_test_assert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_test_assert.c; sourceTree = "<group>"; };
 		DB166D8516A1D1A500A1396C /* SDL_test_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_test_common.c; sourceTree = "<group>"; };
@@ -1318,6 +1337,7 @@
 		DB166E5216A1D69000A1396C /* testscale.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testscale.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DB166E6816A1D6F300A1396C /* testshader.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testshader.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DB166E7E16A1D78400A1396C /* testspriteminimal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testspriteminimal.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DB166E9116A1D78C00A1396C /* teststreaming.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = teststreaming.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DB445EF818184B7000B306B0 /* testdropfile.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testdropfile.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		DB445EFA18184BB600B306B0 /* testdropfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testdropfile.c; sourceTree = "<group>"; };
 		DB89957E18A19ABA0092407C /* testhotplug.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testhotplug.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -1347,9 +1367,6 @@
 		F35E56CD2983130F00A43A5F /* testautomation_mouse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_mouse.c; sourceTree = "<group>"; };
 		F36C34272C0F85DB00991150 /* testcamera.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testcamera.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F36C342C2C0F869B00991150 /* testcamera.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testcamera.c; sourceTree = "<group>"; };
 		F38908B42E81276900CE01D5 /* testautomation_blit.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = testautomation_blit.c; sourceTree = "<group>"; };
 		F38908B52E81276900CE01D5 /* testautomation_images.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testautomation_images.h; sourceTree = "<group>"; };
 		F38908B62E81276900CE01D5 /* testautomation_suites.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testautomation_suites.h; sourceTree = "<group>"; };
 		F399C6492A78929400C86979 /* gamepadutils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gamepadutils.c; sourceTree = "<group>"; };
 		F399C6502A7892D800C86979 /* testautomation_intrinsics.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testautomation_intrinsics.c; sourceTree = "<group>"; };
 		F399C6542A78933000C86979 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -1360,10 +1377,6 @@
 		F3C17CD628E416AC00E1A26D /* testgeometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testgeometry.c; sourceTree = "<group>"; };
 		F3C17CDC28E416CF00E1A26D /* testgeometry.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testgeometry.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F3C2CAC52C5C8BD6004D7998 /* unifont-15.1.05.hex */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "unifont-15.1.05.hex"; sourceTree = "<group>"; };
 		F3DB65E92E9DA90000568044 /* testyuv.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testyuv.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F3DB65ED2E9DA95D00568044 /* testyuv.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = testyuv.png; sourceTree = "<group>"; };
 		F3DB65EF2E9DA98E00568044 /* testyuv.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = testyuv.c; sourceTree = "<group>"; };
 		F3DB65F02E9DA98E00568044 /* testyuv_cvt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = testyuv_cvt.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -1695,6 +1708,14 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		DB166E8316A1D78C00A1396C /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				F3CB57002A78984300766177 /* SDL3.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		DB445EE918184B7000B306B0 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -1743,14 +1764,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F3DB65E02E9DA90000568044 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				F3DB65E12E9DA90000568044 /* SDL3.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
@@ -1765,10 +1778,10 @@
 		00794E4609D207B4003FC8A1 /* Resources */ = {
 			isa = PBXGroup;
 			children = (
-				F3DB65ED2E9DA95D00568044 /* testyuv.png */,
+				00794E5D09D20839003FC8A1 /* icon.bmp */,
 				00794E5D09D20839003FC8A1 /* icon.png */,
 				00794E5E09D20839003FC8A1 /* moose.dat */,
-				00794E6109D20839003FC8A1 /* sample.png */,
+				00794E5F09D20839003FC8A1 /* picture.xbm */,
 				00794E6109D20839003FC8A1 /* sample.bmp */,
 				00794E6209D20839003FC8A1 /* sample.wav */,
 				F3C2CAC52C5C8BD6004D7998 /* unifont-15.1.05.hex */,
 				00794E6309D20839003FC8A1 /* utf8.txt */,
@@ -1802,12 +1815,10 @@
 				001795B01074222D00F5D044 /* testaudioinfo.c */,
 				F35E56CC2983130F00A43A5F /* testautomation.c */,
 				F35E56C42983130D00A43A5F /* testautomation_audio.c */,
 				F38908B42E81276900CE01D5 /* testautomation_blit.c */,
 				F35E56BC2983130B00A43A5F /* testautomation_clipboard.c */,
 				F35E56BB2983130B00A43A5F /* testautomation_events.c */,
 				F35E56C92983130E00A43A5F /* testautomation_guid.c */,
 				F35E56B72983130A00A43A5F /* testautomation_hints.c */,
 				F38908B52E81276900CE01D5 /* testautomation_images.h */,
 				F35E56BF2983130C00A43A5F /* testautomation_images.c */,
 				F399C6502A7892D800C86979 /* testautomation_intrinsics.c */,
 				F35E56B92983130B00A43A5F /* testautomation_iostream.c */,
@@ -1825,7 +1836,6 @@
 				F35E56C82983130E00A43A5F /* testautomation_sdltest.c */,
 				F35E56BE2983130C00A43A5F /* testautomation_stdlib.c */,
 				A1A859492BC72FC20045DD6C /* testautomation_subsystems.c */,
 				F38908B62E81276900CE01D5 /* testautomation_suites.h */,
 				F35E56CB2983130F00A43A5F /* testautomation_surface.c */,
 				A1A8594B2BC72FC20045DD6C /* testautomation_time.c */,
 				F35E56BD2983130B00A43A5F /* testautomation_timer.c */,
@@ -1870,13 +1880,12 @@
 				453774A4120915E3002F0F45 /* testshape.c */,
 				0017991910743F5300F5D044 /* testsprite.c */,
 				DB166CC516A1C74100A1396C /* testspriteminimal.c */,
 				DB166CC616A1C74100A1396C /* teststreaming.c */,
 				092D6D58FFB311A97F000001 /* testthread.c */,
 				083E4880006D86A17F000001 /* testtimer.c */,
 				F3C17C7328E40ADE00E1A26D /* testutils.c */,
 				083E4882006D86A17F000001 /* testver.c */,
 				0017993B10743FEF00F5D044 /* testwm.c */,
 				F3DB65EF2E9DA98E00568044 /* testyuv.c */,
 				F3DB65F02E9DA98E00568044 /* testyuv_cvt.h */,
 				66E88E8A203B778F0004D44E /* testyuv_cvt.c */,
 				083E4887006D86A17F000001 /* torturethread.c */,
 			);
@@ -1926,6 +1935,7 @@
 				DB166E5216A1D69000A1396C /* testscale.app */,
 				DB166E6816A1D6F300A1396C /* testshader.app */,
 				DB166E7E16A1D78400A1396C /* testspriteminimal.app */,
 				DB166E9116A1D78C00A1396C /* teststreaming.app */,
 				DB0F48EC17CA51E5008798C5 /* testdrawchessboard.app */,
 				DB0F490117CA5212008798C5 /* testfilesystem.app */,
 				DB89957E18A19ABA0092407C /* testhotplug.app */,
@@ -1934,7 +1944,6 @@
 				F35E56AA298312CB00A43A5F /* testautomation.app */,
 				F36C34272C0F85DB00991150 /* testcamera.app */,
 				F3B7FD6A2D73FC630086D1D0 /* testpen.app */,
 				F3DB65E92E9DA90000568044 /* testyuv.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1991,6 +2000,7 @@
 			dependencies = (
 			);
 			name = testatomic;
 			productName = testalpha;
 			productReference = 0017958C10741F7900F5D044 /* testatomic.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2007,6 +2017,7 @@
 			dependencies = (
 			);
 			name = testaudioinfo;
 			productName = testalpha;
 			productReference = 001795AD107421BF00F5D044 /* testaudioinfo.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2023,6 +2034,7 @@
 			dependencies = (
 			);
 			name = testgl;
 			productName = testalpha;
 			productReference = 0017972110742F3200F5D044 /* testgl.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2039,6 +2051,7 @@
 			dependencies = (
 			);
 			name = testhaptic;
 			productName = testalpha;
 			productReference = 00179748107430D600F5D044 /* testhaptic.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2055,6 +2068,7 @@
 			dependencies = (
 			);
 			name = testdraw;
 			productName = testalpha;
 			productReference = 0017976E107431B300F5D044 /* testdraw.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2072,6 +2086,7 @@
 			dependencies = (
 			);
 			name = testime;
 			productName = testalpha;
 			productReference = 0017978E107432AE00F5D044 /* testime.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2088,6 +2103,7 @@
 			dependencies = (
 			);
 			name = testintersections;
 			productName = testalpha;
 			productReference = 001797AE1074334C00F5D044 /* testintersections.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2104,6 +2120,7 @@
 			dependencies = (
 			);
 			name = testloadso;
 			productName = testalpha;
 			productReference = 001797D0107433C600F5D044 /* testloadso.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2121,6 +2138,7 @@
 			dependencies = (
 			);
 			name = testmultiaudio;
 			productName = testalpha;
 			productReference = 001798121074355200F5D044 /* testmultiaudio.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2138,6 +2156,7 @@
 			dependencies = (
 			);
 			name = testnative;
 			productName = testalpha;
 			productReference = 001798941074392D00F5D044 /* testnative.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2154,6 +2173,7 @@
 			dependencies = (
 			);
 			name = testpower;
 			productName = testalpha;
 			productReference = 001798B5107439DF00F5D044 /* testpower.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2170,6 +2190,7 @@
 			dependencies = (
 			);
 			name = testresample;
 			productName = testalpha;
 			productReference = 001798F210743BEC00F5D044 /* testresample.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2187,6 +2208,7 @@
 			dependencies = (
 			);
 			name = testsprite;
 			productName = testalpha;
 			productReference = 0017991610743F1000F5D044 /* testsprite.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2203,6 +2225,7 @@
 			dependencies = (
 			);
 			name = testwm;
 			productName = testalpha;
 			productReference = 0017993810743FB700F5D044 /* testwm.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2219,6 +2242,7 @@
 			dependencies = (
 			);
 			name = testfile;
 			productName = testalpha;
 			productReference = 002F341209CA1BFF00EBEB88 /* testfile.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2236,6 +2260,7 @@
 			dependencies = (
 			);
 			name = testiconv;
 			productName = testalpha;
 			productReference = 002F343109CA1F0300EBEB88 /* testiconv.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2253,6 +2278,7 @@
 			dependencies = (
 			);
 			name = testoverlay;
 			productName = testalpha;
 			productReference = 002F344D09CA1FB300EBEB88 /* testoverlay.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2269,6 +2295,7 @@
 			dependencies = (
 			);
 			name = testplatform;
 			productName = testalpha;
 			productReference = 002F346A09CA204F00EBEB88 /* testplatform.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2491,6 +2518,7 @@
 			dependencies = (
 			);
 			name = testdrawchessboard;
 			productName = testalpha;
 			productReference = DB0F48EC17CA51E5008798C5 /* testdrawchessboard.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2507,6 +2535,7 @@
 			dependencies = (
 			);
 			name = testfilesystem;
 			productName = testalpha;
 			productReference = DB0F490117CA5212008798C5 /* testfilesystem.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2540,6 +2569,7 @@
 			dependencies = (
 			);
 			name = testmessage;
 			productName = testalpha;
 			productReference = DB166DD516A1D36A00A1396C /* testmessage.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2556,6 +2586,7 @@
 			dependencies = (
 			);
 			name = testrelative;
 			productName = testalpha;
 			productReference = DB166DEE16A1D50C00A1396C /* testrelative.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2573,6 +2604,7 @@
 			dependencies = (
 			);
 			name = testrendercopyex;
 			productName = testalpha;
 			productReference = DB166E0516A1D57C00A1396C /* testrendercopyex.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2590,6 +2622,7 @@
 			dependencies = (
 			);
 			name = testrendertarget;
 			productName = testalpha;
 			productReference = DB166E1C16A1D5AD00A1396C /* testrendertarget.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2606,6 +2639,7 @@
 			dependencies = (
 			);
 			name = testrumble;
 			productName = testalpha;
 			productReference = DB166E3816A1D64D00A1396C /* testrumble.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2623,6 +2657,7 @@
 			dependencies = (
 			);
 			name = testscale;
 			productName = testalpha;
 			productReference = DB166E5216A1D69000A1396C /* testscale.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2661,6 +2696,24 @@
 			productReference = DB166E7E16A1D78400A1396C /* testspriteminimal.app */;
 			productType = "com.apple.product-type.application";
 		};
 		DB166E8016A1D78C00A1396C /* teststreaming */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DB166E8E16A1D78C00A1396C /* Build configuration list for PBXNativeTarget "teststreaming" */;
 			buildPhases = (
 				DB166E8116A1D78C00A1396C /* Sources */,
 				DB166E8316A1D78C00A1396C /* Frameworks */,
 				DB166E9916A1D7EE00A1396C /* CopyFiles */,
 				F3CB57022A78984300766177 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = teststreaming;
 			productName = teststreaming;
 			productReference = DB166E9116A1D78C00A1396C /* teststreaming.app */;
 			productType = "com.apple.product-type.application";
 		};
 		DB445EE618184B7000B306B0 /* testdropfile */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = DB445EF518184B7000B306B0 /* Build configuration list for PBXNativeTarget "testdropfile" */;
@@ -2691,6 +2744,7 @@
 			dependencies = (
 			);
 			name = testhotplug;
 			productName = testalpha;
 			productReference = DB89957E18A19ABA0092407C /* testhotplug.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2707,6 +2761,7 @@
 			dependencies = (
 			);
 			name = testautomation;
 			productName = testalpha;
 			productReference = F35E56AA298312CB00A43A5F /* testautomation.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2723,6 +2778,7 @@
 			dependencies = (
 			);
 			name = testcamera;
 			productName = testalpha;
 			productReference = F36C34272C0F85DB00991150 /* testcamera.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2739,6 +2795,7 @@
 			dependencies = (
 			);
 			name = testpen;
 			productName = testalpha;
 			productReference = F3B7FD6A2D73FC630086D1D0 /* testpen.app */;
 			productType = "com.apple.product-type.application";
 		};
@@ -2759,23 +2816,6 @@
 			productReference = F3C17CDC28E416CF00E1A26D /* testgeometry.app */;
 			productType = "com.apple.product-type.application";
 		};
 		F3DB65DC2E9DA90000568044 /* testyuv */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = F3DB65E62E9DA90000568044 /* Build configuration list for PBXNativeTarget "testyuv" */;
 			buildPhases = (
 				F3DB65DD2E9DA90000568044 /* Sources */,
 				F3DB65E02E9DA90000568044 /* Frameworks */,
 				F3DB65E22E9DA90000568044 /* Resources */,
 				F3DB65E42E9DA90000568044 /* Embed Frameworks */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = testyuv;
 			productReference = F3DB65E92E9DA90000568044 /* testyuv.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
 /* Begin PBXProject section */
@@ -2905,6 +2945,9 @@
 					DB166E6D16A1D78400A1396C = {
 						ProvisioningStyle = Automatic;
 					};
 					DB166E8016A1D78C00A1396C = {
 						ProvisioningStyle = Automatic;
 					};
 					DB445EE618184B7000B306B0 = {
 						ProvisioningStyle = Automatic;
 					};
@@ -2985,11 +3028,11 @@
 				4537749112091504002F0F45 /* testshape */,
 				001798FE10743F1000F5D044 /* testsprite */,
 				DB166E6D16A1D78400A1396C /* testspriteminimal */,
 				DB166E8016A1D78C00A1396C /* teststreaming */,
 				BEC567230761D90400A33029 /* testthread */,
 				BEC5678D0761D90500A33029 /* testtimer */,
 				BEC567A70761D90500A33029 /* testversion */,
 				0017992010743FB700F5D044 /* testwm */,
 				F3DB65DC2E9DA90000568044 /* testyuv */,
 				BEC567EA0761D90600A33029 /* torturethread */,
 			);
 		};
@@ -3018,7 +3061,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F3C17D3B28E4252900E1A26D /* icon.png in Resources */,
+				F3C17D3B28E4252900E1A26D /* icon.bmp in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3026,19 +3069,11 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				F3C2CB072C5D3FB2004D7998 /* icon.png in Resources */,
+				F3C2CB072C5D3FB2004D7998 /* icon.bmp in Resources */,
 				F3C2CAC62C5C8BD6004D7998 /* unifont-15.1.05.hex in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F3DB65E22E9DA90000568044 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				F3DB65EE2E9DA95D00568044 /* testyuv.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -3181,6 +3216,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				002F345409CA202000EBEB88 /* testoverlay.c in Sources */,
 				66E88E8B203B778F0004D44E /* testyuv_cvt.c in Sources */,
 				F3C17C7F28E4101000E1A26D /* testutils.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -3396,6 +3432,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		DB166E8116A1D78C00A1396C /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				DB166E9416A1D7C700A1396C /* teststreaming.c in Sources */,
 				F3C17C8528E4127D00E1A26D /* testutils.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		DB445EE718184B7000B306B0 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -3433,7 +3478,6 @@
 				F35E56DE2983130F00A43A5F /* testautomation_joystick.c in Sources */,
 				F35E56D82983130F00A43A5F /* testautomation_images.c in Sources */,
 				F35E56DC2983130F00A43A5F /* testautomation_audio.c in Sources */,
 				F38908B72E81276900CE01D5 /* testautomation_blit.c in Sources */,
 				F35E56D32983130F00A43A5F /* testautomation_math.c in Sources */,
 				F35E56E02983130F00A43A5F /* testautomation_sdltest.c in Sources */,
 				F35E56D42983130F00A43A5F /* testautomation_events.c in Sources */,
@@ -3472,16 +3516,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F3DB65DD2E9DA90000568044 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				F3DB65DF2E9DA90000568044 /* testutils.c in Sources */,
 				F3DB65F22E9DA9B400568044 /* testyuv_cvt.c in Sources */,
 				F3DB65F12E9DA98E00568044 /* testyuv.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 /* Begin PBXTargetDependency section */
@@ -3691,6 +3725,11 @@
 			target = DB166E6D16A1D78400A1396C /* testspriteminimal */;
 			targetProxy = DB166E9516A1D7CD00A1396C /* PBXContainerItemProxy */;
 		};
 		DB166E9816A1D7CF00A1396C /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = DB166E8016A1D78C00A1396C /* teststreaming */;
 			targetProxy = DB166E9716A1D7CF00A1396C /* PBXContainerItemProxy */;
 		};
 		F35E56E72983133F00A43A5F /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = F35E56A2298312CB00A43A5F /* testautomation */;
@@ -4014,7 +4053,7 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = ../../include;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
@@ -4022,11 +4061,10 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.$(PRODUCT_NAME)";
-				SUPPORTED_PLATFORMS = "xrsimulator xros macosx iphonesimulator iphoneos appletvsimulator appletvos";
+				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
-				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				XROS_DEPLOYMENT_TARGET = 1.3;
 			};
 			name = Debug;
 		};
@@ -4189,18 +4227,17 @@
 				GENERATE_INFOPLIST_FILE = YES;
 				HEADER_SEARCH_PATHS = ../../include;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.9;
 				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = "$(CONFIG_FRAMEWORK_LDFLAGS)";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.libsdl.$(PRODUCT_NAME)";
-				SUPPORTED_PLATFORMS = "xrsimulator xros macosx iphonesimulator iphoneos appletvsimulator appletvos";
+				SUPPORTED_PLATFORMS = "macosx iphonesimulator iphoneos appletvsimulator appletvos";
-				SUPPORTS_MACCATALYST = YES;
+				SUPPORTS_MACCATALYST = NO;
 				TARGETED_DEVICE_FAMILY = "1,2,3";
-				TVOS_DEPLOYMENT_TARGET = 11.0;
+				TVOS_DEPLOYMENT_TARGET = 9.0;
 				XROS_DEPLOYMENT_TARGET = 1.3;
 			};
 			name = Release;
 		};
@@ -4439,6 +4476,7 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				EXECUTABLE_PREFIX = lib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
 				SUPPORTS_MACCATALYST = YES;
 			};
 			name = Debug;
@@ -4449,6 +4487,7 @@
 				ALLOW_TARGET_PLATFORM_SPECIALIZATION = YES;
 				EXECUTABLE_PREFIX = lib;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "watchsimulator watchos macosx iphonesimulator iphoneos driverkit appletvsimulator appletvos";
 				SUPPORTS_MACCATALYST = YES;
 			};
 			name = Release;
@@ -4613,6 +4652,26 @@
 			};
 			name = Release;
 		};
 		DB166E8F16A1D78C00A1396C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = teststreaming;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Debug;
 		};
 		DB166E9016A1D78C00A1396C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				PRODUCT_NAME = teststreaming;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
 			name = Release;
 		};
 		DB445EF618184B7000B306B0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4697,25 +4756,6 @@
 			};
 			name = Release;
 		};
 		F37E49E22EB5250B00E508F7 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
 		};
 		F37E49E32EB5250B00E508F7 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
 		};
 		F3B7FD682D73FC630086D1D0 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -5146,6 +5186,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
 		DB166E8E16A1D78C00A1396C /* Build configuration list for PBXNativeTarget "teststreaming" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				DB166E8F16A1D78C00A1396C /* Debug */,
 				DB166E9016A1D78C00A1396C /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
 		DB445EF518184B7000B306B0 /* Build configuration list for PBXNativeTarget "testdropfile" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
@@ -5200,15 +5249,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
 		F3DB65E62E9DA90000568044 /* Build configuration list for PBXNativeTarget "testyuv" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				F37E49E22EB5250B00E508F7 /* Debug */,
 				F37E49E32EB5250B00E508F7 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
--- a/Xcode/SDLTest/config.xcconfig
+++ b/Xcode/SDLTest/config.xcconfig
@@ -10,7 +10,5 @@
 // This allows you to set DEVELOPMENT_TEAM for all targets, for example.
 #include? "build.xcconfig"
 INFOPLIST_FILE = test-Info.plist
 CONFIG_FRAMEWORK_LDFLAGS = -lSDL3_test
--- a/Xcode/SDLTest/test-Info.plist
+++ b/Xcode/SDLTest/test-Info.plist
@@ -1,20 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>UILaunchScreen</key>
 	<dict>
 		<key>UIColorName</key>
 		<string></string>
 		<key>UIImageName</key>
 		<string></string>
 	</dict>
    <key>UISupportedInterfaceOrientations</key>
    <array>
        <string>UIInterfaceOrientationLandscapeLeft</string>
        <string>UIInterfaceOrientationLandscapeRight</string>
        <string>UIInterfaceOrientationPortrait</string>
        <string>UIInterfaceOrientationPortraitUpsideDown</string>
    </array>
 </dict>
 </plist>
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -7,7 +7,6 @@ def buildWithCMake = project.hasProperty('BUILD_WITH_CMAKE');
 android {
    namespace = "org.libsdl.app"
    compileSdkVersion 35
    ndkVersion = "28.2.13676358"
    defaultConfig {
        minSdkVersion 21
        targetSdkVersion 35
--- a/android-project/app/jni/src/CMakeLists.txt
+++ b/android-project/app/jni/src/CMakeLists.txt
@@ -3,7 +3,24 @@ cmake_minimum_required(VERSION 3.6)
 project(my_app)
 if(NOT TARGET SDL3::SDL3)
-    find_package(SDL3 CONFIG REQUIRED)
+    find_package(SDL3 CONFIG)
 endif()
 if(NOT TARGET SDL3::SDL3)
    find_library(SDL3_LIBRARY NAMES "SDL3")
    find_path(SDL3_INCLUDE_DIR NAMES "SDL3/SDL.h")
    add_library(SDL3::SDL3 UNKNOWN IMPORTED)
    set_property(TARGET SDL3::SDL3 PROPERTY IMPORTED_LOCATION "${SDL3_LIBRARY}")
    set_property(TARGET SDL3::SDL3 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${SDL3_INCLUDE_DIR}")
 endif()
 if(NOT TARGET SDL3::SDL3)
    message(FATAL_ERROR "Cannot find SDL3.
 Possible ways to fix this:
 - Use a SDL3 Android aar archive, and configure gradle to use it: prefab is required.
 - Add add_subdirectory(path/to/SDL) to your CMake script, and make sure a vendored SDL is present there.
 ")
 endif()
 add_library(main SHARED
--- a/android-project/app/proguard-rules.pro
+++ b/android-project/app/proguard-rules.pro
@@ -23,18 +23,20 @@
    void clipboardSetText(java.lang.String);
    int createCustomCursor(int[], int, int, int, int);
    void destroyCustomCursor(int);
-    android.app.Activity getContext();
+    android.content.Context getContext();
    boolean getManifestEnvironmentVariables();
    android.view.Surface getNativeSurface();
    void initTouch();
    boolean isAndroidTV();
    boolean isChromebook();
    boolean isDeXMode();
    boolean isScreenKeyboardShown();
    boolean isTablet();
    void manualBackButton();
    int messageboxShowMessageBox(int, java.lang.String, java.lang.String, int[], int[], java.lang.String[], int[]);
    void minimizeWindow();
    boolean openURL(java.lang.String);
    void onNativePen(int, int, int , float , float , float);
    void requestPermission(java.lang.String, int);
    boolean showToast(java.lang.String, int, int, int, int);
    boolean sendMessage(int, int);
--- a/android-project/app/src/main/AndroidManifest.xml
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -71,7 +71,6 @@
        android:icon="@mipmap/ic_launcher"
        android:allowBackup="true"
        android:theme="@style/AppTheme"
        android:enableOnBackInvokedCallback="false"
        android:hardwareAccelerated="true" >
        <!-- Example of setting SDL hints from AndroidManifest.xml:
--- a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
+++ b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceBLESteamController.java
@@ -44,9 +44,9 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    private static final int CHROMEBOOK_CONNECTION_CHECK_INTERVAL = 10000;
-    static final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
+    static public final UUID steamControllerService = UUID.fromString("100F6C32-1735-4313-B402-38567131E5F3");
-    static final UUID inputCharacteristic = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
+    static public final UUID inputCharacteristic = UUID.fromString("100F6C33-1735-4313-B402-38567131E5F3");
-    static final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
+    static public final UUID reportCharacteristic = UUID.fromString("100F6C34-1735-4313-B402-38567131E5F3");
    static private final byte[] enterValveMode = new byte[] { (byte)0xC0, (byte)0x87, 0x03, 0x08, 0x07, 0x00 };
    static class GattOperation {
@@ -156,12 +156,12 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        }
    }
-    HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
+    public HIDDeviceBLESteamController(HIDDeviceManager manager, BluetoothDevice device) {
        mManager = manager;
        mDevice = device;
        mDeviceId = mManager.getDeviceIDForIdentifier(getIdentifier());
        mIsRegistered = false;
-        mIsChromebook = SDLActivity.isChromebook();
+        mIsChromebook = mManager.getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
        mOperations = new LinkedList<GattOperation>();
        mHandler = new Handler(Looper.getMainLooper());
@@ -169,17 +169,17 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        // final HIDDeviceBLESteamController finalThis = this;
        // mHandler.postDelayed(new Runnable() {
        //     @Override
-        //     void run() {
+        //     public void run() {
        //         finalThis.checkConnectionForChromebookIssue();
        //     }
        // }, CHROMEBOOK_CONNECTION_CHECK_INTERVAL);
    }
-    String getIdentifier() {
+    public String getIdentifier() {
        return String.format("SteamController.%s", mDevice.getAddress());
    }
-    BluetoothGatt getGatt() {
+    public BluetoothGatt getGatt() {
        return mGatt;
    }
@@ -219,7 +219,7 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        return btManager.getConnectionState(mDevice, BluetoothProfile.GATT);
    }
-    void reconnect() {
+    public void reconnect() {
        if (getConnectionState() != BluetoothProfile.STATE_CONNECTED) {
            mGatt.disconnect();
@@ -401,12 +401,12 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        queueGattOperation(op);
    }
-    void writeCharacteristic(UUID uuid, byte[] value) {
+    public void writeCharacteristic(UUID uuid, byte[] value) {
        GattOperation op = HIDDeviceBLESteamController.GattOperation.writeCharacteristic(mGatt, uuid, value);
        queueGattOperation(op);
    }
-    void readCharacteristic(UUID uuid) {
+    public void readCharacteristic(UUID uuid) {
        GattOperation op = HIDDeviceBLESteamController.GattOperation.readCharacteristic(mGatt, uuid);
        queueGattOperation(op);
    }
@@ -415,7 +415,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
    //////////////  BluetoothGattCallback overridden methods
    //////////////////////////////////////////////////////////////////////////////////////////////////////
    @Override
    public void onConnectionStateChange(BluetoothGatt g, int status, int newState) {
        //Log.v(TAG, "onConnectionStateChange status=" + status + " newState=" + newState);
        mIsReconnecting = false;
@@ -438,7 +437,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        // Disconnection is handled in SteamLink using the ACTION_ACL_DISCONNECTED Intent.
    }
    @Override
    public void onServicesDiscovered(BluetoothGatt gatt, int status) {
        //Log.v(TAG, "onServicesDiscovered status=" + status);
        if (status == 0) {
@@ -455,7 +453,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        }
    }
    @Override
    public void onCharacteristicRead(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
        //Log.v(TAG, "onCharacteristicRead status=" + status + " uuid=" + characteristic.getUuid());
@@ -466,7 +463,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        finishCurrentGattOperation();
    }
    @Override
    public void onCharacteristicWrite(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic, int status) {
        //Log.v(TAG, "onCharacteristicWrite status=" + status + " uuid=" + characteristic.getUuid());
@@ -482,7 +478,6 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        finishCurrentGattOperation();
    }
    @Override
    public void onCharacteristicChanged(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
    // Enable this for verbose logging of controller input reports
        //Log.v(TAG, "onCharacteristicChanged uuid=" + characteristic.getUuid() + " data=" + HexDump.dumpHexString(characteristic.getValue()));
@@ -492,12 +487,10 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        }
    }
    @Override
    public void onDescriptorRead(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
        //Log.v(TAG, "onDescriptorRead status=" + status);
    }
    @Override
    public void onDescriptorWrite(BluetoothGatt gatt, BluetoothGattDescriptor descriptor, int status) {
        BluetoothGattCharacteristic chr = descriptor.getCharacteristic();
        //Log.v(TAG, "onDescriptorWrite status=" + status + " uuid=" + chr.getUuid() + " descriptor=" + descriptor.getUuid());
@@ -515,17 +508,14 @@ class HIDDeviceBLESteamController extends BluetoothGattCallback implements HIDDe
        finishCurrentGattOperation();
    }
    @Override
    public void onReliableWriteCompleted(BluetoothGatt gatt, int status) {
        //Log.v(TAG, "onReliableWriteCompleted status=" + status);
    }
    @Override
    public void onReadRemoteRssi(BluetoothGatt gatt, int rssi, int status) {
        //Log.v(TAG, "onReadRemoteRssi status=" + status);
    }
    @Override
    public void onMtuChanged(BluetoothGatt gatt, int mtu, int status) {
        //Log.v(TAG, "onMtuChanged status=" + status);
    }
--- a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -32,7 +32,7 @@ public class HIDDeviceManager {
    private static HIDDeviceManager sManager;
    private static int sManagerRefCount = 0;
-    static public HIDDeviceManager acquire(Context context) {
+    public static HIDDeviceManager acquire(Context context) {
        if (sManagerRefCount == 0) {
            sManager = new HIDDeviceManager(context);
        }
@@ -40,7 +40,7 @@ public class HIDDeviceManager {
        return sManager;
    }
-    static public void release(HIDDeviceManager manager) {
+    public static void release(HIDDeviceManager manager) {
        if (manager == sManager) {
            --sManagerRefCount;
            if (sManagerRefCount == 0) {
@@ -108,12 +108,12 @@ public class HIDDeviceManager {
        HIDDeviceRegisterCallback();
        mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
-        mIsChromebook = SDLActivity.isChromebook();
+        mIsChromebook = mContext.getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
 //        if (shouldClear) {
 //            SharedPreferences.Editor spedit = mSharedPreferences.edit();
 //            spedit.clear();
-//            spedit.apply();
+//            spedit.commit();
 //        }
 //        else
        {
@@ -121,11 +121,11 @@ public class HIDDeviceManager {
        }
    }
-    Context getContext() {
+    public Context getContext() {
        return mContext;
    }
-    int getDeviceIDForIdentifier(String identifier) {
+    public int getDeviceIDForIdentifier(String identifier) {
        SharedPreferences.Editor spedit = mSharedPreferences.edit();
        int result = mSharedPreferences.getInt(identifier, 0);
@@ -135,7 +135,7 @@ public class HIDDeviceManager {
        }
        spedit.putInt(identifier, result);
-        spedit.apply();
+        spedit.commit();
        return result;
    }
@@ -193,7 +193,7 @@ public class HIDDeviceManager {
        filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
        filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
        filter.addAction(HIDDeviceManager.ACTION_USB_PERMISSION);
-        if (Build.VERSION.SDK_INT >= 33) { /* Android 13.0 (TIRAMISU) */
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
            mContext.registerReceiver(mUsbBroadcast, filter, Context.RECEIVER_EXPORTED);
        } else {
            mContext.registerReceiver(mUsbBroadcast, filter);
@@ -288,13 +288,9 @@ public class HIDDeviceManager {
            0x1532, // Razer Wildcat
            0x20d6, // PowerA
            0x24c6, // PowerA
            0x294b, // Snakebyte
            0x2dc8, // 8BitDo
            0x2e24, // Hyperkin
            0x2e95, // SCUF
            0x3285, // Nacon
            0x3537, // GameSir
            0x366c, // ByoWave
        };
        if (usbInterface.getId() == 0 &&
@@ -380,7 +376,7 @@ public class HIDDeviceManager {
            return;
        }
-        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
+        if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE) || (Build.VERSION.SDK_INT < 18 /* Android 4.3 (JELLY_BEAN_MR2) */)) {
            Log.d(TAG, "Couldn't initialize Bluetooth, this version of Android does not support Bluetooth LE");
            return;
        }
@@ -412,7 +408,7 @@ public class HIDDeviceManager {
        IntentFilter filter = new IntentFilter();
        filter.addAction(BluetoothDevice.ACTION_ACL_CONNECTED);
        filter.addAction(BluetoothDevice.ACTION_ACL_DISCONNECTED);
-        if (Build.VERSION.SDK_INT >= 33) { /* Android 13.0 (TIRAMISU) */
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
            mContext.registerReceiver(mBluetoothBroadcast, filter, Context.RECEIVER_EXPORTED);
        } else {
            mContext.registerReceiver(mBluetoothBroadcast, filter);
@@ -443,7 +439,7 @@ public class HIDDeviceManager {
    // Chromebooks do not pass along ACTION_ACL_CONNECTED / ACTION_ACL_DISCONNECTED properly.
    // This function provides a sort of dummy version of that, watching for changes in the
    // connected devices and attempting to add controllers as things change.
-    void chromebookConnectionHandler() {
+    public void chromebookConnectionHandler() {
        if (!mIsChromebook) {
            return;
        }
@@ -482,7 +478,7 @@ public class HIDDeviceManager {
        }, 10000);
    }
-    boolean connectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+    public boolean connectBluetoothDevice(BluetoothDevice bluetoothDevice) {
        Log.v(TAG, "connectBluetoothDevice device=" + bluetoothDevice);
        synchronized (this) {
            if (mBluetoothDevices.containsKey(bluetoothDevice)) {
@@ -503,7 +499,7 @@ public class HIDDeviceManager {
        return true;
    }
-    void disconnectBluetoothDevice(BluetoothDevice bluetoothDevice) {
+    public void disconnectBluetoothDevice(BluetoothDevice bluetoothDevice) {
        synchronized (this) {
            HIDDeviceBLESteamController device = mBluetoothDevices.get(bluetoothDevice);
            if (device == null)
@@ -517,7 +513,7 @@ public class HIDDeviceManager {
        }
    }
-    boolean isSteamController(BluetoothDevice bluetoothDevice) {
+    public boolean isSteamController(BluetoothDevice bluetoothDevice) {
        // Sanity check.  If you pass in a null device, by definition it is never a Steam Controller.
        if (bluetoothDevice == null) {
            return false;
@@ -571,7 +567,7 @@ public class HIDDeviceManager {
    ////////// JNI interface functions
    //////////////////////////////////////////////////////////////////////////////////////////////////////
-    boolean initialize(boolean usb, boolean bluetooth) {
+    public boolean initialize(boolean usb, boolean bluetooth) {
        Log.v(TAG, "initialize(" + usb + ", " + bluetooth + ")");
        if (usb) {
@@ -583,7 +579,7 @@ public class HIDDeviceManager {
        return true;
    }
-    boolean openDevice(int deviceID) {
+    public boolean openDevice(int deviceID) {
        Log.v(TAG, "openDevice deviceID=" + deviceID);
        HIDDevice device = getDevice(deviceID);
        if (device == null) {
@@ -603,10 +599,13 @@ public class HIDDeviceManager {
                } else {
                    flags = 0;
                }
-
+                if (Build.VERSION.SDK_INT >= 33 /* Android 14.0 (U) */) {
-                Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
+                   Intent intent = new Intent(HIDDeviceManager.ACTION_USB_PERMISSION);
-                intent.setPackage(mContext.getPackageName());
+                   intent.setPackage(mContext.getPackageName());
-                mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
+                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, intent, flags));
               } else {
                   mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0, new Intent(HIDDeviceManager.ACTION_USB_PERMISSION), flags));
               }
            } catch (Exception e) {
                Log.v(TAG, "Couldn't request permission for USB device " + usbDevice);
                HIDDeviceOpenResult(deviceID, false);
@@ -622,7 +621,7 @@ public class HIDDeviceManager {
        return false;
    }
-    int writeReport(int deviceID, byte[] report, boolean feature) {
+    public int writeReport(int deviceID, byte[] report, boolean feature) {
        try {
            //Log.v(TAG, "writeReport deviceID=" + deviceID + " length=" + report.length);
            HIDDevice device;
@@ -639,7 +638,7 @@ public class HIDDeviceManager {
        return -1;
    }
-    boolean readReport(int deviceID, byte[] report, boolean feature) {
+    public boolean readReport(int deviceID, byte[] report, boolean feature) {
        try {
            //Log.v(TAG, "readReport deviceID=" + deviceID);
            HIDDevice device;
@@ -656,7 +655,7 @@ public class HIDDeviceManager {
        return false;
    }
-    void closeDevice(int deviceID) {
+    public void closeDevice(int deviceID) {
        try {
            Log.v(TAG, "closeDevice deviceID=" + deviceID);
            HIDDevice device;
--- a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java
+++ b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java
@@ -4,7 +4,6 @@ import android.hardware.usb.*;
 import android.os.Build;
 import android.util.Log;
 import java.util.Arrays;
 import java.util.Locale;
 class HIDDeviceUSB implements HIDDevice {
@@ -31,8 +30,8 @@ class HIDDeviceUSB implements HIDDevice {
        mRunning = false;
    }
-    String getIdentifier() {
+    public String getIdentifier() {
-        return String.format(Locale.ENGLISH, "%s/%x/%x/%d", mDevice.getDeviceName(), mDevice.getVendorId(), mDevice.getProductId(), mInterfaceIndex);
+        return String.format("%s/%x/%x/%d", mDevice.getDeviceName(), mDevice.getVendorId(), mDevice.getProductId(), mInterfaceIndex);
    }
    @Override
@@ -53,11 +52,13 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public String getSerialNumber() {
        String result = null;
-        try {
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
-            result = mDevice.getSerialNumber();
+            try {
-        }
+                result = mDevice.getSerialNumber();
-        catch (SecurityException exception) {
+            }
-            //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
+            catch (SecurityException exception) {
                //Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
            }
        }
        if (result == null) {
            result = "";
@@ -72,8 +73,10 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public String getManufacturerName() {
-        String result;
+        String result = null;
-        result = mDevice.getManufacturerName();
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
            result = mDevice.getManufacturerName();
        }
        if (result == null) {
            result = String.format("%x", getVendorId());
        }
@@ -82,8 +85,10 @@ class HIDDeviceUSB implements HIDDevice {
    @Override
    public String getProductName() {
-        String result;
+        String result = null;
-        result = mDevice.getProductName();
+        if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
            result = mDevice.getProductName();
        }
        if (result == null) {
            result = String.format("%x", getProductId());
        }
@@ -95,7 +100,7 @@ class HIDDeviceUSB implements HIDDevice {
        return mDevice;
    }
-    String getDeviceName() {
+    public String getDeviceName() {
        return getManufacturerName() + " " + getProductName() + "(0x" + String.format("%x", getVendorId()) + "/0x" + String.format("%x", getProductId()) + ")";
    }
--- a/android-project/app/src/main/java/org/libsdl/app/SDL.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDL.java
@@ -1,8 +1,8 @@
 package org.libsdl.app;
 import android.app.Activity;
 import android.content.Context;
 import java.lang.Class;
 import java.lang.reflect.Method;
 /**
@@ -12,14 +12,14 @@ public class SDL {
    // This function should be called first and sets up the native code
    // so it can call into the Java classes
-    static public void setupJNI() {
+    public static void setupJNI() {
        SDLActivity.nativeSetupJNI();
        SDLAudioManager.nativeSetupJNI();
        SDLControllerManager.nativeSetupJNI();
    }
    // This function should be called each time the activity is started
-    static public void initialize() {
+    public static void initialize() {
        setContext(null);
        SDLActivity.initialize();
@@ -28,20 +28,20 @@ public class SDL {
    }
    // This function stores the current activity (SDL or not)
-    static public void setContext(Activity context) {
+    public static void setContext(Context context) {
        SDLAudioManager.setContext(context);
        mContext = context;
    }
-    static public Activity getContext() {
+    public static Context getContext() {
        return mContext;
    }
-    static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+    public static void loadLibrary(String libraryName) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
        loadLibrary(libraryName, mContext);
    }
-    static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
+    public static void loadLibrary(String libraryName, Context context) throws UnsatisfiedLinkError, SecurityException, NullPointerException {
        if (libraryName == null) {
            throw new NullPointerException("No library name provided.");
@@ -86,5 +86,5 @@ public class SDL {
        }
    }
-    protected static Activity mContext;
+    protected static Context mContext;
 }
--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -60,8 +60,8 @@ import java.util.Locale;
 public class SDLActivity extends Activity implements View.OnSystemUiVisibilityChangeListener {
    private static final String TAG = "SDL";
    private static final int SDL_MAJOR_VERSION = 3;
-    private static final int SDL_MINOR_VERSION = 4;
+    private static final int SDL_MINOR_VERSION = 2;
-    private static final int SDL_MICRO_VERSION = 0;
+    private static final int SDL_MICRO_VERSION = 28;
 /*
    // Display InputType.SOURCE/CLASS of events and devices
    //
@@ -107,9 +107,11 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        if ((s & tst) == tst) src += " GAMEPAD";
        s2 &= ~tst;
-        tst = InputDevice.SOURCE_HDMI;
+        if (Build.VERSION.SDK_INT >= 21) {
-        if ((s & tst) == tst) src += " HDMI";
+            tst = InputDevice.SOURCE_HDMI;
-        s2 &= ~tst;
+            if ((s & tst) == tst) src += " HDMI";
            s2 &= ~tst;
        }
        tst = InputDevice.SOURCE_JOYSTICK;
        if ((s & tst) == tst) src += " JOYSTICK";
@@ -144,9 +146,11 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        if ((s & tst) == tst) src += " TOUCHSCREEN";
        s2 &= ~tst;
-        tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
+        if (Build.VERSION.SDK_INT >= 18) {
-        if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
+            tst = InputDevice.SOURCE_TOUCH_NAVIGATION;
-        s2 &= ~tst;
+            if ((s & tst) == tst) src += " TOUCH_NAVIGATION";
            s2 &= ~tst;
        }
        tst = InputDevice.SOURCE_TRACKBALL;
        if ((s & tst) == tst) src += " TRACKBALL";
@@ -215,6 +219,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    protected static SDLActivity mSingleton;
    protected static SDLSurface mSurface;
    protected static SDLDummyEdit mTextEdit;
    protected static boolean mScreenKeyboardShown;
    protected static ViewGroup mLayout;
    protected static SDLClipboardHandler mClipboardHandler;
    protected static Hashtable<Integer, PointerIcon> mCursors;
@@ -229,11 +234,9 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private static SDLFileDialogState mFileDialogState = null;
    protected static boolean mDispatchingKeyEvent = false;
-    public static SDLGenericMotionListener_API14 getMotionListener() {
+    protected static SDLGenericMotionListener_API14 getMotionListener() {
        if (mMotionListener == null) {
-            if (Build.VERSION.SDK_INT >= 29 /* Android 10 (Q) */) {
+            if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                mMotionListener = new SDLGenericMotionListener_API29();
            } else if (Build.VERSION.SDK_INT >= 26 /* Android 8.0 (O) */) {
                mMotionListener = new SDLGenericMotionListener_API26();
            } else if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
                mMotionListener = new SDLGenericMotionListener_API24();
@@ -895,7 +898,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    protected static class SDLCommandHandler extends Handler {
        @Override
        public void handleMessage(Message msg) {
-            Context context = getContext();
+            Context context = SDL.getContext();
            if (context == null) {
                Log.e(TAG, "error handling message, getContext() returned null");
                return;
@@ -909,37 +912,39 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                }
                break;
            case COMMAND_CHANGE_WINDOW_STYLE:
-                if (context instanceof Activity) {
+                if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
-                    Window window = ((Activity) context).getWindow();
+                    if (context instanceof Activity) {
-                    if (window != null) {
+                        Window window = ((Activity) context).getWindow();
-                        if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
+                        if (window != null) {
-                            int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+                            if ((msg.obj instanceof Integer) && ((Integer) msg.obj != 0)) {
-                                    View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
-                                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
-                                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-                                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+                                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-                            window.getDecorView().setSystemUiVisibility(flags);
+                                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
-                            window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                                window.getDecorView().setSystemUiVisibility(flags);
-                            window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                                window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                            SDLActivity.mFullscreenModeActive = true;
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-                        } else {
+                                SDLActivity.mFullscreenModeActive = true;
-                            int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
+                            } else {
-                            window.getDecorView().setSystemUiVisibility(flags);
+                                int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
-                            window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                                window.getDecorView().setSystemUiVisibility(flags);
-                            window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                                window.addFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-                            SDLActivity.mFullscreenModeActive = false;
+                                window.clearFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                        }
+                                SDLActivity.mFullscreenModeActive = false;
-                        if (Build.VERSION.SDK_INT >= 30 /* Android 11 (R) */) {
+                            }
-                            window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+                            if (Build.VERSION.SDK_INT >= 28 /* Android 9 (Pie) */) {
-                        }
+                                window.getAttributes().layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
-                        if (Build.VERSION.SDK_INT >= 30 /* Android 11 (R) */ &&
+                            }
-                            Build.VERSION.SDK_INT < 35 /* Android 15 */) {
+                            if (Build.VERSION.SDK_INT >= 30 /* Android 11 (R) */ &&
-                            SDLActivity.onNativeInsetsChanged(0, 0, 0, 0);
+                                Build.VERSION.SDK_INT < 35 /* Android 15 */) {
                                SDLActivity.onNativeInsetsChanged(0, 0, 0, 0);
                            }
                        }
                    } else {
                        Log.e(TAG, "error handling message, getContext() returned no Activity");
                    }
                } else {
                    Log.e(TAG, "error handling message, getContext() returned no Activity");
                }
                break;
            case COMMAND_TEXTEDIT_HIDE:
@@ -952,7 +957,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
                    InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
                    imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
-                    onNativeScreenKeyboardHidden();
+                    mScreenKeyboardShown = false;
                    mSurface.requestFocus();
                }
@@ -989,51 +994,53 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        msg.obj = data;
        boolean result = commandHandler.sendMessage(msg);
-        if (command == COMMAND_CHANGE_WINDOW_STYLE) {
+        if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
-            // Ensure we don't return until the resize has actually happened,
+            if (command == COMMAND_CHANGE_WINDOW_STYLE) {
-            // or 500ms have passed.
+                // Ensure we don't return until the resize has actually happened,
                // or 500ms have passed.
-            boolean bShouldWait = false;
+                boolean bShouldWait = false;
-            if (data instanceof Integer) {
+                if (data instanceof Integer) {
-                // Let's figure out if we're already laid out fullscreen or not.
+                    // Let's figure out if we're already laid out fullscreen or not.
-                Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+                    Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-                DisplayMetrics realMetrics = new DisplayMetrics();
+                    DisplayMetrics realMetrics = new DisplayMetrics();
-                display.getRealMetrics(realMetrics);
+                    display.getRealMetrics(realMetrics);
-                boolean bFullscreenLayout = ((realMetrics.widthPixels == mSurface.getWidth()) &&
+                    boolean bFullscreenLayout = ((realMetrics.widthPixels == mSurface.getWidth()) &&
-                        (realMetrics.heightPixels == mSurface.getHeight()));
+                            (realMetrics.heightPixels == mSurface.getHeight()));
-                if ((Integer) data == 1) {
+                    if ((Integer) data == 1) {
-                    // If we aren't laid out fullscreen or actively in fullscreen mode already, we're going
+                        // If we aren't laid out fullscreen or actively in fullscreen mode already, we're going
-                    // to change size and should wait for surfaceChanged() before we return, so the size
+                        // to change size and should wait for surfaceChanged() before we return, so the size
-                    // is right back in native code.  If we're already laid out fullscreen, though, we're
+                        // is right back in native code.  If we're already laid out fullscreen, though, we're
-                    // not going to change size even if we change decor modes, so we shouldn't wait for
+                        // not going to change size even if we change decor modes, so we shouldn't wait for
-                    // surfaceChanged() -- which may not even happen -- and should return immediately.
+                        // surfaceChanged() -- which may not even happen -- and should return immediately.
-                    bShouldWait = !bFullscreenLayout;
+                        bShouldWait = !bFullscreenLayout;
-                } else {
+                    } else {
-                    // If we're laid out fullscreen (even if the status bar and nav bar are present),
+                        // If we're laid out fullscreen (even if the status bar and nav bar are present),
-                    // or are actively in fullscreen, we're going to change size and should wait for
+                        // or are actively in fullscreen, we're going to change size and should wait for
-                    // surfaceChanged before we return, so the size is right back in native code.
+                        // surfaceChanged before we return, so the size is right back in native code.
-                    bShouldWait = bFullscreenLayout;
+                        bShouldWait = bFullscreenLayout;
                    }
                }
            }
-            if (bShouldWait && (getContext() != null)) {
+                if (bShouldWait && (SDLActivity.getContext() != null)) {
-                // We'll wait for the surfaceChanged() method, which will notify us
+                    // We'll wait for the surfaceChanged() method, which will notify us
-                // when called.  That way, we know our current size is really the
+                    // when called.  That way, we know our current size is really the
-                // size we need, instead of grabbing a size that's still got
+                    // size we need, instead of grabbing a size that's still got
-                // the navigation and/or status bars before they're hidden.
+                    // the navigation and/or status bars before they're hidden.
-                //
+                    //
-                // We'll wait for up to half a second, because some devices
+                    // We'll wait for up to half a second, because some devices
-                // take a surprisingly long time for the surface resize, but
+                    // take a surprisingly long time for the surface resize, but
-                // then we'll just give up and return.
+                    // then we'll just give up and return.
-                //
+                    //
-                synchronized (getContext()) {
+                    synchronized (SDLActivity.getContext()) {
-                    try {
+                        try {
-                        getContext().wait(500);
+                            SDLActivity.getContext().wait(500);
-                    } catch (InterruptedException ie) {
+                        } catch (InterruptedException ie) {
-                        ie.printStackTrace();
+                            ie.printStackTrace();
                        }
                    }
                }
            }
@@ -1044,7 +1051,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    // C functions we call
    public static native String nativeGetVersion();
-    public static native void nativeSetupJNI();
+    public static native int nativeSetupJNI();
    public static native void nativeInitMainThread();
    public static native void nativeCleanupMainThread();
    public static native int nativeRunMain(String library, String function, Object arguments);
@@ -1065,14 +1072,12 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    public static native void onNativeTouch(int touchDevId, int pointerFingerId,
                                            int action, float x,
                                            float y, float p);
-    public static native void onNativePen(int penId, int device_type, int button, int action, float x, float y, float p);
+    public static native void onNativePen(int penId, int button, int action, float x, float y, float p);
    public static native void onNativeAccel(float x, float y, float z);
    public static native void onNativeClipboardChanged();
    public static native void onNativeSurfaceCreated();
    public static native void onNativeSurfaceChanged();
    public static native void onNativeSurfaceDestroyed();
    public static native void onNativeScreenKeyboardShown();
    public static native void onNativeScreenKeyboardHidden();
    public static native String nativeGetHint(String name);
    public static native boolean nativeGetHintBoolean(String name, boolean default_value);
    public static native void nativeSetenv(String name, String value);
@@ -1086,9 +1091,6 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    public static native boolean nativeAllowRecreateActivity();
    public static native int nativeCheckSDLThreadCounter();
    public static native void onNativeFileDialog(int requestCode, String[] filelist, int filter);
    public static native void onNativePinchStart();
    public static native void onNativePinchUpdate(float scale);
    public static native void onNativePinchEnd();
    /**
     * This method is called by SDL using JNI.
@@ -1211,6 +1213,24 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        return false;
    }
    /**
     * This method is called by SDL using JNI.
     */
    public static boolean isScreenKeyboardShown()
    {
        if (mTextEdit == null) {
            return false;
        }
        if (!mScreenKeyboardShown) {
            return false;
        }
        InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
        return imm.isAcceptingText();
    }
    /**
     * This method is called by SDL using JNI.
     */
@@ -1255,7 +1275,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    /**
     * This method is called by SDL using JNI.
     */
-    public static Activity getContext() {
+    public static Context getContext() {
        return SDL.getContext();
    }
@@ -1316,17 +1336,10 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     * This method is called by SDL using JNI.
     */
    public static boolean isChromebook() {
-        // https://stackoverflow.com/questions/39784415/how-to-detect-programmatically-if-android-app-is-running-in-chrome-book-or-in
+        if (getContext() == null) {
-        if (getContext() != null) {
+            return false;
            if (getContext().getPackageManager().hasSystemFeature("org.chromium.arc")
                || getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management")) {
                return true;
            }
        }
-
+        return getContext().getPackageManager().hasSystemFeature("org.chromium.arc.device_management");
        // Running on AVD emulator
        boolean isChromebookEmulator = (Build.MODEL != null && Build.MODEL.startsWith("sdk_gpc_"));
        return isChromebookEmulator;
    }
    /**
@@ -1416,7 +1429,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            params.topMargin = y;
            if (mTextEdit == null) {
-                mTextEdit = new SDLDummyEdit(getContext());
+                mTextEdit = new SDLDummyEdit(SDL.getContext());
                mLayout.addView(mTextEdit, params);
            } else {
@@ -1427,12 +1440,10 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            mTextEdit.setVisibility(View.VISIBLE);
            mTextEdit.requestFocus();
-            InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            InputMethodManager imm = (InputMethodManager) SDL.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
            imm.showSoftInput(mTextEdit, 0);
-            if (imm.isAcceptingText()) {
+            mScreenKeyboardShown = true;
                onNativeScreenKeyboardShown();
            }
        }
    }
@@ -1761,14 +1772,16 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
    private final Runnable rehideSystemUi = new Runnable() {
        @Override
        public void run() {
-            int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
-                    View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
+                int flags = View.SYSTEM_UI_FLAG_FULLSCREEN |
-                    View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
+                        View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
+                        View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY |
-                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+                        View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-                    View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
+                        View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
                        View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.INVISIBLE;
-            SDLActivity.this.getWindow().getDecorView().setSystemUiVisibility(flags);
+                SDLActivity.this.getWindow().getDecorView().setSystemUiVisibility(flags);
            }
        }
    };
@@ -1923,7 +1936,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
        }
        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            try {
-                mSurface.setPointerIcon(PointerIcon.getSystemIcon(getContext(), cursor_type));
+                mSurface.setPointerIcon(PointerIcon.getSystemIcon(SDL.getContext(), cursor_type));
            } catch (Exception e) {
                return false;
            }
@@ -1963,9 +1976,12 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
            Intent i = new Intent(Intent.ACTION_VIEW);
            i.setData(Uri.parse(url));
-            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY 
+            int flags = Intent.FLAG_ACTIVITY_NO_HISTORY | Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
-                      | Intent.FLAG_ACTIVITY_MULTIPLE_TASK
+            if (Build.VERSION.SDK_INT >= 21 /* Android 5.0 (LOLLIPOP) */) {
-                      | Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
+                flags |= Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
            } else {
                flags |= Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET;
            }
            i.addFlags(flags);
            mSingleton.startActivity(i);
--- a/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLAudioManager.java
@@ -10,14 +10,14 @@ import android.util.Log;
 import java.util.Arrays;
 import java.util.ArrayList;
-class SDLAudioManager {
+public class SDLAudioManager {
    protected static final String TAG = "SDLAudio";
    protected static Context mContext;
    private static AudioDeviceCallback mAudioDeviceCallback;
-    static void initialize() {
+    public static void initialize() {
        mAudioDeviceCallback = null;
        if(Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */)
@@ -26,25 +26,25 @@ class SDLAudioManager {
                @Override
                public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
                    for (AudioDeviceInfo deviceInfo : addedDevices) {
-                        nativeAddAudioDevice(deviceInfo.isSink(), deviceInfo.getProductName().toString(), deviceInfo.getId());
+                        addAudioDevice(deviceInfo.isSink(), deviceInfo.getProductName().toString(), deviceInfo.getId());
                    }
                }
                @Override
                public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
                    for (AudioDeviceInfo deviceInfo : removedDevices) {
-                        nativeRemoveAudioDevice(deviceInfo.isSink(), deviceInfo.getId());
+                        removeAudioDevice(deviceInfo.isSink(), deviceInfo.getId());
                    }
                }
            };
        }
    }
-    static void setContext(Context context) {
+    public static void setContext(Context context) {
        mContext = context;
    }
-    static void release(Context context) {
+    public static void release(Context context) {
        // no-op atm
    }
@@ -74,7 +74,7 @@ class SDLAudioManager {
        return null;
    }
-    static void registerAudioDeviceCallback() {
+    public static void registerAudioDeviceCallback() {
        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
            // get an initial list now, before hotplug callbacks fire.
@@ -82,16 +82,16 @@ class SDLAudioManager {
                if (dev.getType() == AudioDeviceInfo.TYPE_TELEPHONY) {
                    continue;  // Device cannot be opened
                }
-                nativeAddAudioDevice(dev.isSink(), dev.getProductName().toString(), dev.getId());
+                addAudioDevice(dev.isSink(), dev.getProductName().toString(), dev.getId());
            }
            for (AudioDeviceInfo dev : audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS)) {
-                nativeAddAudioDevice(dev.isSink(), dev.getProductName().toString(), dev.getId());
+                addAudioDevice(dev.isSink(), dev.getProductName().toString(), dev.getId());
            }
            audioManager.registerAudioDeviceCallback(mAudioDeviceCallback, null);
        }
    }
-    static void unregisterAudioDeviceCallback() {
+    public static void unregisterAudioDeviceCallback() {
        if (Build.VERSION.SDK_INT >= 24 /* Android 7.0 (N) */) {
            AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
            audioManager.unregisterAudioDeviceCallback(mAudioDeviceCallback);
@@ -99,7 +99,7 @@ class SDLAudioManager {
    }
    /** This method is called by SDL using JNI. */
-    static void audioSetThreadPriority(boolean recording, int device_id) {
+    public static void audioSetThreadPriority(boolean recording, int device_id) {
        try {
            /* Set thread name */
@@ -117,10 +117,10 @@ class SDLAudioManager {
        }
    }
-    static native void nativeSetupJNI();
+    public static native int nativeSetupJNI();
-    static native void nativeRemoveAudioDevice(boolean recording, int deviceId);
+    public static native void removeAudioDevice(boolean recording, int deviceId);
-    static native void nativeAddAudioDevice(boolean recording, String name, int deviceId);
+    public static native void addAudioDevice(boolean recording, String name, int deviceId);
 }
--- a/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLControllerManager.java
@@ -6,11 +6,6 @@ import java.util.Comparator;
 import java.util.List;
 import android.content.Context;
 import android.hardware.lights.Light;
 import android.hardware.lights.LightsRequest;
 import android.hardware.lights.LightsManager;
 import android.hardware.lights.LightState;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
@@ -25,20 +20,20 @@ import android.view.View;
 public class SDLControllerManager
 {
-    static native void nativeSetupJNI();
+    public static native int nativeSetupJNI();
-    static native void nativeAddJoystick(int device_id, String name, String desc,
+    public static native void nativeAddJoystick(int device_id, String name, String desc,
                                                int vendor_id, int product_id,
                                                int button_mask,
-                                                int naxes, int axis_mask, int nhats, boolean can_rumble, boolean has_rgb_led);
+                                                int naxes, int axis_mask, int nhats, boolean can_rumble);
-    static native void nativeRemoveJoystick(int device_id);
+    public static native void nativeRemoveJoystick(int device_id);
-    static native void nativeAddHaptic(int device_id, String name);
+    public static native void nativeAddHaptic(int device_id, String name);
-    static native void nativeRemoveHaptic(int device_id);
+    public static native void nativeRemoveHaptic(int device_id);
-    static public native boolean onNativePadDown(int device_id, int keycode);
+    public static native boolean onNativePadDown(int device_id, int keycode);
-    static public native boolean onNativePadUp(int device_id, int keycode);
+    public static native boolean onNativePadUp(int device_id, int keycode);
-    static native void onNativeJoy(int device_id, int axis,
+    public static native void onNativeJoy(int device_id, int axis,
                                          float value);
-    static native void onNativeHat(int device_id, int hat_id,
+    public static native void onNativeHat(int device_id, int hat_id,
                                          int x, int y);
    protected static SDLJoystickHandler mJoystickHandler;
@@ -46,9 +41,13 @@ public class SDLControllerManager
    private static final String TAG = "SDLControllerManager";
-    static void initialize() {
+    public static void initialize() {
        if (mJoystickHandler == null) {
-            mJoystickHandler = new SDLJoystickHandler();
+            if (Build.VERSION.SDK_INT >= 19 /* Android 4.4 (KITKAT) */) {
                mJoystickHandler = new SDLJoystickHandler_API19();
            } else {
                mJoystickHandler = new SDLJoystickHandler_API16();
            }
        }
        if (mHapticHandler == null) {
@@ -63,55 +62,48 @@ public class SDLControllerManager
    }
    // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
-    static public boolean handleJoystickMotionEvent(MotionEvent event) {
+    public static boolean handleJoystickMotionEvent(MotionEvent event) {
        return mJoystickHandler.handleMotionEvent(event);
    }
    /**
     * This method is called by SDL using JNI.
     */
-    static void pollInputDevices() {
+    public static void pollInputDevices() {
        mJoystickHandler.pollInputDevices();
    }
    /**
     * This method is called by SDL using JNI.
     */
-    static void joystickSetLED(int device_id, int red, int green, int blue) {
+    public static void pollHapticDevices() {
        mJoystickHandler.setLED(device_id, red, green, blue);
    }
    /**
     * This method is called by SDL using JNI.
     */
    static void pollHapticDevices() {
        mHapticHandler.pollHapticDevices();
    }
    /**
     * This method is called by SDL using JNI.
     */
-    static void hapticRun(int device_id, float intensity, int length) {
+    public static void hapticRun(int device_id, float intensity, int length) {
        mHapticHandler.run(device_id, intensity, length);
    }
    /**
     * This method is called by SDL using JNI.
     */
-    static void hapticRumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
+    public static void hapticRumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
        mHapticHandler.rumble(device_id, low_frequency_intensity, high_frequency_intensity, length);
    }
    /**
     * This method is called by SDL using JNI.
     */
-    static void hapticStop(int device_id)
+    public static void hapticStop(int device_id)
    {
        mHapticHandler.stop(device_id);
    }
    // Check if a given device is considered a possible SDL joystick
-    static public boolean isDeviceSDLJoystick(int deviceId) {
+    public static boolean isDeviceSDLJoystick(int deviceId) {
        InputDevice device = InputDevice.getDevice(deviceId);
        // We cannot use InputDevice.isVirtual before API 16, so let's accept
        // only nonnegative device ids (VIRTUAL_KEYBOARD equals -1)
@@ -141,18 +133,33 @@ public class SDLControllerManager
 }
 /* Actual joystick functionality available for API >= 19 devices */
 class SDLJoystickHandler {
    /**
     * Handles given MotionEvent.
     * @param event the event to be handled.
     * @return if given event was processed.
     */
    public boolean handleMotionEvent(MotionEvent event) {
        return false;
    }
    /**
     * Handles adding and removing of input devices.
     */
    public void pollInputDevices() {
    }
 }
 /* Actual joystick functionality available for API >= 12 devices */
 class SDLJoystickHandler_API16 extends SDLJoystickHandler {
    static class SDLJoystick {
-        int device_id;
+        public int device_id;
-        String name;
+        public String name;
-        String desc;
+        public String desc;
-        ArrayList<InputDevice.MotionRange> axes;
+        public ArrayList<InputDevice.MotionRange> axes;
-        ArrayList<InputDevice.MotionRange> hats;
+        public ArrayList<InputDevice.MotionRange> hats;
        ArrayList<Light> lights;
        LightsManager.LightsSession lightsSession;
    }
    static class RangeComparator implements Comparator<InputDevice.MotionRange> {
        @Override
@@ -203,15 +210,13 @@ class SDLJoystickHandler {
    private final ArrayList<SDLJoystick> mJoysticks;
-    SDLJoystickHandler() {
+    public SDLJoystickHandler_API16() {
        mJoysticks = new ArrayList<SDLJoystick>();
    }
-    /**
+    @Override
-     * Handles adding and removing of input devices.
+    public void pollInputDevices() {
     */
    void pollInputDevices() {
        int[] deviceIds = InputDevice.getDeviceIds();
        for (int device_id : deviceIds) {
@@ -225,7 +230,6 @@ class SDLJoystickHandler {
                    joystick.desc = getJoystickDescriptor(joystickDevice);
                    joystick.axes = new ArrayList<InputDevice.MotionRange>();
                    joystick.hats = new ArrayList<InputDevice.MotionRange>();
                    joystick.lights = new ArrayList<Light>();
                    List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
                    Collections.sort(ranges, new RangeComparator());
@@ -240,30 +244,18 @@ class SDLJoystickHandler {
                    }
                    boolean can_rumble = false;
                    boolean has_rgb_led = false;
                    if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
-                        VibratorManager vibratorManager = joystickDevice.getVibratorManager();
+                        VibratorManager manager = joystickDevice.getVibratorManager();
-                        int[] vibrators = vibratorManager.getVibratorIds();
+                        int[] vibrators = manager.getVibratorIds();
                        if (vibrators.length > 0) {
                            can_rumble = true;
                        }
                        LightsManager lightsManager = joystickDevice.getLightsManager();
                        List<Light> lights = lightsManager.getLights();
                        for (Light light : lights) {
                            if (light.hasRgbControl()) {
                                joystick.lights.add(light);
                            }
                        }
                        if (!joystick.lights.isEmpty()) {
                            joystick.lightsSession = lightsManager.openSession();
                            has_rgb_led = true;
                        }
                    }
                    mJoysticks.add(joystick);
                    SDLControllerManager.nativeAddJoystick(joystick.device_id, joystick.name, joystick.desc,
                            getVendorId(joystickDevice), getProductId(joystickDevice),
-                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble, has_rgb_led);
+                            getButtonMask(joystickDevice), joystick.axes.size(), getAxisMask(joystick.axes), joystick.hats.size()/2, can_rumble);
                }
            }
        }
@@ -289,16 +281,6 @@ class SDLJoystickHandler {
                SDLControllerManager.nativeRemoveJoystick(device_id);
                for (int i = 0; i < mJoysticks.size(); i++) {
                    if (mJoysticks.get(i).device_id == device_id) {
                        if (Build.VERSION.SDK_INT >= 31 /* Android 12.0 (S) */) {
                            if (mJoysticks.get(i).lightsSession != null) {
                                try {
                                    mJoysticks.get(i).lightsSession.close();
                                } catch (Exception e) {
                                    // Session may already be unregistered when device disconnects
                                }
                                mJoysticks.get(i).lightsSession = null;
                            }
                        }
                        mJoysticks.remove(i);
                        break;
                    }
@@ -316,12 +298,8 @@ class SDLJoystickHandler {
        return null;
    }
-    /**
+    @Override
-     * Handles given MotionEvent.
+    public boolean handleMotionEvent(MotionEvent event) {
     * @param event the event to be handled.
     * @return if given event was processed.
     */
    boolean handleMotionEvent(MotionEvent event) {
        int actionPointerIndex = event.getActionIndex();
        int action = event.getActionMasked();
        if (action == MotionEvent.ACTION_MOVE) {
@@ -343,7 +321,7 @@ class SDLJoystickHandler {
        return true;
    }
-    String getJoystickDescriptor(InputDevice joystickDevice) {
+    public String getJoystickDescriptor(InputDevice joystickDevice) {
        String desc = joystickDevice.getDescriptor();
        if (desc != null && !desc.isEmpty()) {
@@ -352,16 +330,34 @@ class SDLJoystickHandler {
        return joystickDevice.getName();
    }
    public int getProductId(InputDevice joystickDevice) {
        return 0;
    }
    public int getVendorId(InputDevice joystickDevice) {
        return 0;
    }
    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
        return -1;
    }
    public int getButtonMask(InputDevice joystickDevice) {
        return -1;
    }
 }
-    int getProductId(InputDevice joystickDevice) {
+class SDLJoystickHandler_API19 extends SDLJoystickHandler_API16 {
    @Override
    public int getProductId(InputDevice joystickDevice) {
        return joystickDevice.getProductId();
    }
-    int getVendorId(InputDevice joystickDevice) {
+    @Override
    public int getVendorId(InputDevice joystickDevice) {
        return joystickDevice.getVendorId();
    }
-    int getAxisMask(List<InputDevice.MotionRange> ranges) {
+    @Override
    public int getAxisMask(List<InputDevice.MotionRange> ranges) {
        // For compatibility, keep computing the axis mask like before,
        // only really distinguishing 2, 4 and 6 axes.
        int axis_mask = 0;
@@ -397,7 +393,8 @@ class SDLJoystickHandler {
        return axis_mask;
    }
-    int getButtonMask(InputDevice joystickDevice) {
+    @Override
    public int getButtonMask(InputDevice joystickDevice) {
        int button_mask = 0;
        int[] keys = new int[] {
            KeyEvent.KEYCODE_BUTTON_A,
@@ -490,29 +487,11 @@ class SDLJoystickHandler {
        }
        return button_mask;
    }
    void setLED(int device_id, int red, int green, int blue) {
        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
            return;
        }
        SDLJoystick joystick = getJoystick(device_id);
        if (joystick == null || joystick.lights.isEmpty()) {
            return;
        }
        LightsRequest.Builder lightsRequest = new LightsRequest.Builder();
        LightState lightState = new LightState.Builder().setColor(Color.rgb(red, green, blue)).build();
        for (Light light : joystick.lights) {
            if (light.hasRgbControl()) {
                lightsRequest.addLight(light, lightState);
            }
        }
        joystick.lightsSession.requestLights(lightsRequest.build());
    }
 }
 class SDLHapticHandler_API31 extends SDLHapticHandler {
    @Override
-    void run(int device_id, float intensity, int length) {
+    public void run(int device_id, float intensity, int length) {
        SDLHaptic haptic = getHaptic(device_id);
        if (haptic != null) {
            vibrate(haptic.vib, intensity, length);
@@ -520,17 +499,12 @@ class SDLHapticHandler_API31 extends SDLHapticHandler {
    }
    @Override
-    void rumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
+    public void rumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
        InputDevice device = InputDevice.getDevice(device_id);
        if (device == null) {
            return;
        }
        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
            /* Silence 'lint' warning */
            return;
        }
        VibratorManager manager = device.getVibratorManager();
        int[] vibrators = manager.getVibratorIds();
        if (vibrators.length >= 2) {
@@ -543,12 +517,6 @@ class SDLHapticHandler_API31 extends SDLHapticHandler {
    }
    private void vibrate(Vibrator vibrator, float intensity, int length) {
        if (Build.VERSION.SDK_INT < 31 /* Android 12.0 (S) */) {
            /* Silence 'lint' warning */
            return;
        }
        if (intensity == 0.0f) {
            vibrator.cancel();
            return;
@@ -575,13 +543,7 @@ class SDLHapticHandler_API31 extends SDLHapticHandler {
 class SDLHapticHandler_API26 extends SDLHapticHandler {
    @Override
-    void run(int device_id, float intensity, int length) {
+    public void run(int device_id, float intensity, int length) {
        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
            /* Silence 'lint' warning */
            return;
        }
        SDLHaptic haptic = getHaptic(device_id);
        if (haptic != null) {
            if (intensity == 0.0f) {
@@ -613,36 +575,36 @@ class SDLHapticHandler_API26 extends SDLHapticHandler {
 class SDLHapticHandler {
    static class SDLHaptic {
-        int device_id;
+        public int device_id;
-        String name;
+        public String name;
-        Vibrator vib;
+        public Vibrator vib;
    }
    private final ArrayList<SDLHaptic> mHaptics;
-    SDLHapticHandler() {
+    public SDLHapticHandler() {
        mHaptics = new ArrayList<SDLHaptic>();
    }
-    void run(int device_id, float intensity, int length) {
+    public void run(int device_id, float intensity, int length) {
        SDLHaptic haptic = getHaptic(device_id);
        if (haptic != null) {
            haptic.vib.vibrate(length);
        }
    }
-    void rumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
+    public void rumble(int device_id, float low_frequency_intensity, float high_frequency_intensity, int length) {
        // Not supported in older APIs
    }
-    void stop(int device_id) {
+    public void stop(int device_id) {
        SDLHaptic haptic = getHaptic(device_id);
        if (haptic != null) {
            haptic.vib.cancel();
        }
    }
-    void pollHapticDevices() {
+    public void pollHapticDevices() {
        final int deviceId_VIBRATOR_SERVICE = 999999;
        boolean hasVibratorService = false;
@@ -701,10 +663,6 @@ class SDLHapticHandler {
 }
 class SDLGenericMotionListener_API14 implements View.OnGenericMotionListener {
    protected static final int SDL_PEN_DEVICE_TYPE_UNKNOWN = 0;
    protected static final int SDL_PEN_DEVICE_TYPE_DIRECT = 1;
    protected static final int SDL_PEN_DEVICE_TYPE_INDIRECT = 2;
    // Generic Motion (mouse hover, joystick...) events go here
    @Override
    public boolean onGenericMotion(View v, MotionEvent event) {
@@ -756,7 +714,7 @@ class SDLGenericMotionListener_API14 implements View.OnGenericMotionListener {
                        // BUTTON_STYLUS_PRIMARY is 2^5, so shift by 4, and apply SDL_PEN_INPUT_DOWN/SDL_PEN_INPUT_ERASER_TIP
                        int buttons = (event.getButtonState() >> 4) | (1 << (toolType == MotionEvent.TOOL_TYPE_STYLUS ? 0 : 30));
-                        SDLActivity.onNativePen(event.getPointerId(i), getPenDeviceType(event.getDevice()), buttons, action, x, y, p);
+                        SDLActivity.onNativePen(event.getPointerId(i), buttons, action, x, y, p);
                        consumed = true;
                        break;
                }
@@ -766,37 +724,34 @@ class SDLGenericMotionListener_API14 implements View.OnGenericMotionListener {
        return consumed;
    }
-    boolean supportsRelativeMouse() {
+    public boolean supportsRelativeMouse() {
        return false;
    }
-    boolean inRelativeMode() {
+    public boolean inRelativeMode() {
        return false;
    }
-    boolean setRelativeMouseEnabled(boolean enabled) {
+    public boolean setRelativeMouseEnabled(boolean enabled) {
        return false;
    }
-    void reclaimRelativeMouseModeIfNeeded() {
+    public void reclaimRelativeMouseModeIfNeeded() {
    }
-    boolean checkRelativeEvent(MotionEvent event) {
+    public boolean checkRelativeEvent(MotionEvent event) {
        return inRelativeMode();
    }
-    float getEventX(MotionEvent event, int pointerIndex) {
+    public float getEventX(MotionEvent event, int pointerIndex) {
        return event.getX(pointerIndex);
    }
-    float getEventY(MotionEvent event, int pointerIndex) {
+    public float getEventY(MotionEvent event, int pointerIndex) {
        return event.getY(pointerIndex);
    }
    int getPenDeviceType(InputDevice penDevice) {
        return SDL_PEN_DEVICE_TYPE_UNKNOWN;
    }
 }
 class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API14 {
@@ -805,28 +760,23 @@ class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API14 {
    private boolean mRelativeModeEnabled;
    @Override
-    boolean supportsRelativeMouse() {
+    public boolean supportsRelativeMouse() {
        return true;
    }
    @Override
-    boolean inRelativeMode() {
+    public boolean inRelativeMode() {
        return mRelativeModeEnabled;
    }
    @Override
-    boolean setRelativeMouseEnabled(boolean enabled) {
+    public boolean setRelativeMouseEnabled(boolean enabled) {
        mRelativeModeEnabled = enabled;
        return true;
    }
    @Override
-    float getEventX(MotionEvent event, int pointerIndex) {
+    public float getEventX(MotionEvent event, int pointerIndex) {
        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
            /* Silence 'lint' warning */
            return 0;
        }
        if (mRelativeModeEnabled && event.getToolType(pointerIndex) == MotionEvent.TOOL_TYPE_MOUSE) {
            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X, pointerIndex);
        } else {
@@ -835,12 +785,7 @@ class SDLGenericMotionListener_API24 extends SDLGenericMotionListener_API14 {
    }
    @Override
-    float getEventY(MotionEvent event, int pointerIndex) {
+    public float getEventY(MotionEvent event, int pointerIndex) {
        if (Build.VERSION.SDK_INT < 24 /* Android 7.0 (N) */) {
            /* Silence 'lint' warning */
            return 0;
        }
        if (mRelativeModeEnabled && event.getToolType(pointerIndex) == MotionEvent.TOOL_TYPE_MOUSE) {
            return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y, pointerIndex);
        } else {
@@ -854,23 +799,17 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
    private boolean mRelativeModeEnabled;
    @Override
-    boolean supportsRelativeMouse() {
+    public boolean supportsRelativeMouse() {
        return (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */);
    }
    @Override
-    boolean inRelativeMode() {
+    public boolean inRelativeMode() {
        return mRelativeModeEnabled;
    }
    @Override
-    boolean setRelativeMouseEnabled(boolean enabled) {
+    public boolean setRelativeMouseEnabled(boolean enabled) {
        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
            /* Silence 'lint' warning */
            return false;
        }
        if (!SDLActivity.isDeXMode() || Build.VERSION.SDK_INT >= 27 /* Android 8.1 (O_MR1) */) {
            if (enabled) {
                SDLActivity.getContentView().requestPointerCapture();
@@ -885,48 +824,26 @@ class SDLGenericMotionListener_API26 extends SDLGenericMotionListener_API24 {
    }
    @Override
-    void reclaimRelativeMouseModeIfNeeded() {
+    public void reclaimRelativeMouseModeIfNeeded() {
        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
            /* Silence 'lint' warning */
            return;
        }
        if (mRelativeModeEnabled && !SDLActivity.isDeXMode()) {
            SDLActivity.getContentView().requestPointerCapture();
        }
    }
    @Override
-    boolean checkRelativeEvent(MotionEvent event) {
+    public boolean checkRelativeEvent(MotionEvent event) {
        if (Build.VERSION.SDK_INT < 26 /* Android 8.0 (O) */) {
            /* Silence 'lint' warning */
            return false;
        }
        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
    }
    @Override
-    float getEventX(MotionEvent event, int pointerIndex) {
+    public float getEventX(MotionEvent event, int pointerIndex) {
        // Relative mouse in capture mode will only have relative for X/Y
        return event.getX(pointerIndex);
    }
    @Override
-    float getEventY(MotionEvent event, int pointerIndex) {
+    public float getEventY(MotionEvent event, int pointerIndex) {
        // Relative mouse in capture mode will only have relative for X/Y
        return event.getY(pointerIndex);
    }
 }
 class SDLGenericMotionListener_API29 extends SDLGenericMotionListener_API26 {
    @Override
    int getPenDeviceType(InputDevice penDevice)
    {
        if (penDevice == null) {
            return SDL_PEN_DEVICE_TYPE_UNKNOWN;
        }
        return penDevice.isExternal() ? SDL_PEN_DEVICE_TYPE_INDIRECT : SDL_PEN_DEVICE_TYPE_DIRECT;
    }
 }
--- a/android-project/app/src/main/java/org/libsdl/app/SDLDummyEdit.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLDummyEdit.java
@@ -14,14 +14,14 @@ public class SDLDummyEdit extends View implements View.OnKeyListener
    InputConnection ic;
    int input_type;
-    SDLDummyEdit(Context context) {
+    public SDLDummyEdit(Context context) {
        super(context);
        setFocusableInTouchMode(true);
        setFocusable(true);
        setOnKeyListener(this);
    }
-    void setInputType(int input_type) {
+    public void setInputType(int input_type) {
        this.input_type = input_type;
    }
--- a/android-project/app/src/main/java/org/libsdl/app/SDLInputConnection.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLInputConnection.java
@@ -7,12 +7,12 @@ import android.view.*;
 import android.view.inputmethod.BaseInputConnection;
 import android.widget.EditText;
-class SDLInputConnection extends BaseInputConnection
+public class SDLInputConnection extends BaseInputConnection
 {
    protected EditText mEditText;
    protected String mCommittedText = "";
-    SDLInputConnection(View targetView, boolean fullEditor) {
+    public SDLInputConnection(View targetView, boolean fullEditor) {
        super(targetView, fullEditor);
        mEditText = new EditText(SDL.getContext());
    }
--- a/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLSurface.java
@@ -23,7 +23,6 @@ import android.view.View;
 import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.view.ScaleGestureDetector;
 /**
    SDLSurface. This is what we draw on, so we need to know when it's created
@@ -32,8 +31,7 @@ import android.view.ScaleGestureDetector;
    Because of this, that's where we set up the SDL thread
 */
 public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
-    View.OnApplyWindowInsetsListener, View.OnKeyListener, View.OnTouchListener,
+    View.OnApplyWindowInsetsListener, View.OnKeyListener, View.OnTouchListener, SensorEventListener  {
    SensorEventListener, ScaleGestureDetector.OnScaleGestureListener {
    // Sensors
    protected SensorManager mSensorManager;
@@ -43,18 +41,13 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
    protected float mWidth, mHeight;
    // Is SurfaceView ready for rendering
-    protected boolean mIsSurfaceReady;
+    public boolean mIsSurfaceReady;
    // Pinch events
    private final ScaleGestureDetector scaleGestureDetector;
    // Startup
-    protected SDLSurface(Context context) {
+    public SDLSurface(Context context) {
        super(context);
        getHolder().addCallback(this);
        scaleGestureDetector = new ScaleGestureDetector(context, this);
        setFocusable(true);
        setFocusableInTouchMode(true);
        requestFocus();
@@ -74,11 +67,11 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
        mIsSurfaceReady = false;
    }
-    protected void handlePause() {
+    public void handlePause() {
        enableSensor(Sensor.TYPE_ACCELEROMETER, false);
    }
-    protected void handleResume() {
+    public void handleResume() {
        setFocusable(true);
        setFocusableInTouchMode(true);
        requestFocus();
@@ -88,7 +81,7 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
        enableSensor(Sensor.TYPE_ACCELEROMETER, true);
    }
-    protected Surface getNativeSurface() {
+    public Surface getNativeSurface() {
        return getHolder().getSurface();
    }
@@ -129,12 +122,14 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
        float density = 1.0f;
        try
        {
-            DisplayMetrics realMetrics = new DisplayMetrics();
+            if (Build.VERSION.SDK_INT >= 17 /* Android 4.2 (JELLY_BEAN_MR1) */) {
-            mDisplay.getRealMetrics( realMetrics );
+                DisplayMetrics realMetrics = new DisplayMetrics();
-            nDeviceWidth = realMetrics.widthPixels;
+                mDisplay.getRealMetrics( realMetrics );
-            nDeviceHeight = realMetrics.heightPixels;
+                nDeviceWidth = realMetrics.widthPixels;
-            // Use densityDpi instead of density to more closely match what the UI scale is
+                nDeviceHeight = realMetrics.heightPixels;
-            density = (float)realMetrics.densityDpi / 160.0f;
+                // Use densityDpi instead of density to more closely match what the UI scale is
                density = (float)realMetrics.densityDpi / 160.0f;
            }
        } catch(Exception ignored) {
        }
@@ -281,7 +276,7 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
                // BUTTON_STYLUS_PRIMARY is 2^5, so shift by 4, and apply SDL_PEN_INPUT_DOWN/SDL_PEN_INPUT_ERASER_TIP
                int buttonState = (event.getButtonState() >> 4) | (1 << (toolType == MotionEvent.TOOL_TYPE_STYLUS ? 0 : 30));
-                SDLActivity.onNativePen(pointerId, SDLActivity.getMotionListener().getPenDeviceType(event.getDevice()), buttonState, action, x, y, p);
+                SDLActivity.onNativePen(pointerId, buttonState, action, x, y, p);
            } else { // MotionEvent.TOOL_TYPE_FINGER or MotionEvent.TOOL_TYPE_UNKNOWN
                pointerId = event.getPointerId(i);
                x = getNormalizedX(event.getX(i));
@@ -301,13 +296,11 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
                break;
        } while (++i < pointerCount);
        scaleGestureDetector.onTouchEvent(event);
        return true;
    }
    // Sensor events
-    protected void enableSensor(int sensortype, boolean enabled) {
+    public void enableSensor(int sensortype, boolean enabled) {
        // TODO: This uses getDefaultSensor - what if we have >1 accels?
        if (enabled) {
            mSensorManager.registerListener(this,
@@ -381,7 +374,6 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
    }
    // Captured pointer events for API 26.
    @Override
    public boolean onCapturedPointerEvent(MotionEvent event)
    {
        int action = event.getActionMasked();
@@ -424,23 +416,4 @@ public class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
        return false;
    }
    @Override
    public boolean onScale(ScaleGestureDetector detector) {
        float scale = detector.getScaleFactor();
        SDLActivity.onNativePinchUpdate(scale);
        return true;
    }
    @Override
    public boolean onScaleBegin(ScaleGestureDetector detector) {
        SDLActivity.onNativePinchStart();
        return true;
    }
    @Override
    public void onScaleEnd(ScaleGestureDetector detector) {
        SDLActivity.onNativePinchEnd();
    }
 }
--- a/build-scripts/SDL_migration.cocci
+++ b/build-scripts/SDL_migration.cocci
@@ -116,7 +116,7 @@ expression e;
@@
 - SDL_JoystickGetDevicePlayerIndex(e)
 + /* FIXME MIGRATION: check for valid instance */
-+ SDL_GetJoystickPlayerIndexForID(GetJoystickInstanceFromIndex(e))
+ SDL_GetJoystickInstancePlayerIndex(GetJoystickInstanceFromIndex(e))
@@
 expression e;
@@ -130,7 +130,7 @@ expression e;
@@
 - SDL_JoystickPathForIndex(e)
 + /* FIXME MIGRATION: check for valid instance */
-+ SDL_GetJoystickPathForID(GetJoystickInstanceFromIndex(e))
+ SDL_GetJoystickInstancePath(GetJoystickInstanceFromIndex(e))
@@
 expression e;
@@ -144,28 +144,28 @@ expression e;
@@
 - SDL_GameControllerMappingForDeviceIndex(e)
 + /* FIXME MIGRATION: check for valid instance */
-+ SDL_GetGamepadMappingForID(GetJoystickInstanceFromIndex(e))
+ SDL_GetGamepadInstanceMapping(GetJoystickInstanceFromIndex(e))
@@
 expression e;
@@
 - SDL_GameControllerNameForIndex(e)
 + /* FIXME MIGRATION: check for valid instance */
-+ SDL_GetGamepadNameForID(GetJoystickInstanceFromIndex(e))
+ SDL_GetGamepadInstanceName(GetJoystickInstanceFromIndex(e))
@@
 expression e;
@@
 - SDL_GameControllerPathForIndex(e)
 + /* FIXME MIGRATION: check for valid instance */
-+ SDL_GetGamepadPathForID(GetJoystickInstanceFromIndex(e))
+ SDL_GetGamepadInstancePath(GetJoystickInstanceFromIndex(e))
@@
 expression e;
@@
 - SDL_GameControllerTypeForIndex(e)
 + /* FIXME MIGRATION: check for valid instance */
-+ SDL_GetGamepadTypeForID(GetJoystickInstanceFromIndex(e))
+ SDL_GetGamepadInstanceType(GetJoystickInstanceFromIndex(e))
 // SDL_Has3DNow() has been removed; there is no replacement.
--- a/build-scripts/build-web-examples.pl
+++ b/build-scripts/build-web-examples.pl
@@ -187,11 +187,6 @@ sub handle_example_dir {
        $description =~ s/\s+\Z//;
    }
    my $short_description = "$description";
    $short_description =~ s/\<br\/\>\n.*//gms;
    $short_description =~ s/\A\s+//;
    $short_description =~ s/\s+\Z//;
    do_mkdir($dst);
    do_copy($jssrc, $jsdst);
    do_copy($wasmsrc, $wasmdst);
@@ -227,7 +222,7 @@ sub handle_example_dir {
    my $other_examples_html = "<ul>";
    foreach my $example (get_examples_for_category($category)) {
-        $other_examples_html .= "<li><a href='/$project/$category/$example/'>$category/$example</a></li>";
+        $other_examples_html .= "<li><a href='/$project/$category/$example'>$category/$example</a></li>";
    }
    $other_examples_html .= "</ul>";
@@ -243,7 +238,6 @@ sub handle_example_dir {
        s/\@example_name\@/$example/g;
        s/\@javascript_file\@/$jsfname/g;
        s/\@htmlified_source_code\@/$htmlified_source_code/g;
        s/\@short_description\@/$short_description/g;
        s/\@description\@/$description/g;
        s/\@preview_image\@/$preview_image/g;
        s/\@other_examples_html\@/$other_examples_html/g;
@@ -274,7 +268,6 @@ sub generate_example_thumbnail {
    my $project = shift;
    my $category = shift;
    my $example = shift;
    my $preloadhtmlref = shift;
    my $example_no_num = "$example";
    $example_no_num =~ s/\A\d+\-//;
@@ -284,14 +277,12 @@ sub generate_example_thumbnail {
    my $example_mouseover_html = '';
    if ( -f "$examples_dir/$category/$example/onmouseover.webp" ) {
        $example_mouseover_html = "onmouseover=\"this.src='/$project/$category/$example/onmouseover.webp'\" onmouseout=\"this.src='$example_image_url';\"";
        $$preloadhtmlref .= "    <link rel='preload' as='image' href='/$project/$category/$example/onmouseover.webp'>\n";
    } elsif ( -f "$examples_dir/$category/onmouseover.webp" ) {
        $example_mouseover_html = "onmouseover=\"this.src='/$project/$category/onmouseover.webp'\" onmouseout=\"this.src='$example_image_url';\"";
        $$preloadhtmlref .= "    <link rel='preload' as='image' href='/$project/$category/onmouseover.webp'>\n";
    }
    return "
-        <a href='/$project/$category/$example/'>
+        <a href='/$project/$category/$example'>
          <div>
            <img src='$example_image_url' $example_mouseover_html />
            <div>$example_no_num</div>
@@ -303,11 +294,10 @@ sub generate_example_thumbnail {
 sub generate_example_thumbnails_for_category {
    my $project = shift;
    my $category = shift;
    my $preloadhtmlref = shift;
    my @examples = get_examples_for_category($category);
    my $retval = '';
    foreach my $example (@examples) {
-        $retval .= generate_example_thumbnail($project, $category, $example, $preloadhtmlref);
+        $retval .= generate_example_thumbnail($project, $category, $example);
    }
    return $retval;
 }
@@ -329,8 +319,7 @@ sub handle_category_dir {
    closedir($dh);
-    my $preloadhtml = '';
+    my $examples_list_html = generate_example_thumbnails_for_category($project, $category);
    my $examples_list_html = generate_example_thumbnails_for_category($project, $category, \$preloadhtml);
    my $dst = "$output_dir/$category";
@@ -350,7 +339,6 @@ sub handle_category_dir {
        s/\@project_name\@/$project/g;
        s/\@category_name\@/$category/g;
        s/\@category_description\@/$category_description/g;
        s/\@preload_images_html\@/$preloadhtml/g;
        s/\@examples_list_html\@/$examples_list_html/g;
        s/\@preview_image\@/$preview_image/g;
        $html .= $_;
@@ -402,13 +390,12 @@ while (readdir($dh)) {
 closedir($dh);
 # write homepage
-my $homepage_list_html = '';
+my $homepage_list_html = "";
 my $homepage_preloadhtml = '';
 foreach my $category (get_categories()) {
    my $category_description = get_category_description($category);
    $homepage_list_html .= "<h2>$category_description</h2>";
    $homepage_list_html .= "<div class='list'>";
-    $homepage_list_html .= generate_example_thumbnails_for_category($project, $category, \$homepage_preloadhtml);
+    $homepage_list_html .= generate_example_thumbnails_for_category($project, $category);
    $homepage_list_html .= "</div>";
 }
@@ -421,7 +408,6 @@ while (<$htmltemplate>) {
    s/\@project_name\@/$project/g;
    s/\@homepage_list_html\@/$homepage_list_html/g;
    s/\@preview_image\@/$preview_image/g;
    s/\@preload_images_html\@/$homepage_preloadhtml/g;
    $html .= $_;
 }
 close($htmltemplate);
--- a/build-scripts/check_android_jni.py
+++ b/build-scripts/check_android_jni.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import argparse
 import dataclasses
--- a/build-scripts/check_stdlib_usage.py
+++ b/build-scripts/check_stdlib_usage.py
@@ -29,7 +29,7 @@ import sys
 SDL_ROOT = pathlib.Path(__file__).resolve().parents[1]
-STDLIB_SYMBOLS = (
+STDLIB_SYMBOLS = [
    'abs',
    'acos',
    'acosf',
@@ -147,8 +147,8 @@ STDLIB_SYMBOLS = (
    'wcsncasecmp',
    'wcsncmp',
    'wcsstr',
-)
+]
-RE_STDLIB_SYMBOL = re.compile(rf"(?<!->)\b(?P<symbol>{'|'.join(STDLIB_SYMBOLS)})\b\(")
+RE_STDLIB_SYMBOL = re.compile(rf"\b(?P<symbol>{'|'.join(STDLIB_SYMBOLS)})\b\(")
 def find_symbols_in_file(file: pathlib.Path) -> int:
@@ -161,7 +161,6 @@ def find_symbols_in_file(file: pathlib.Path) -> int:
        "src/libm",
        "src/hidapi",
        "src/video/khronos",
        "src/video/miniz.h",
        "src/video/stb_image.h",
        "include/SDL3",
        "build-scripts/gen_audio_resampler_filter.c",
@@ -220,19 +219,13 @@ def find_symbols_in_file(file: pathlib.Path) -> int:
                    line_comment += line[pos_line_comment:]
                    line = line[:pos_line_comment]
-                if matches := tuple(RE_STDLIB_SYMBOL.finditer(line)):
+                if m := RE_STDLIB_SYMBOL.match(line):
-                    text_string = " or ".join(f"SDL_{m.group(1)}" for m in matches)
+                    override_string = f"This should NOT be SDL_{m['symbol']}()"
-                    first_quote = line.find("\"")
+                    if override_string not in line_comment:
-                    last_quote = line.rfind("\"")
+                        print(f"{filename}:{line_i}")
-                    first_occurrence = min(m.span()[0] for m in matches)
+                        print(f"    {line}")
-                    last_occurrence = max(m.span()[1] for m in matches)
+                        print(f"")
-                    if first_quote == -1 or not (first_quote < first_occurrence and last_quote > last_occurrence):
+                        match_count += 1
                        override_string = f"This should NOT be {text_string}"
                        if override_string not in line_comment:
                            print(f"{filename}:{line_i}")
                            print(f"    {line}")
                            print(f"")
                            match_count += 1
    except UnicodeDecodeError:
        print(f"{file} is not text, skipping", file=sys.stderr)
@@ -241,7 +234,7 @@ def find_symbols_in_file(file: pathlib.Path) -> int:
 def find_symbols_in_dir(path: pathlib.Path) -> int:
    match_count = 0
-    for entry in path.iterdir():
+    for entry in path.glob("*"):
        if entry.is_dir():
            match_count += find_symbols_in_dir(entry)
        else:
@@ -255,10 +248,7 @@ def main():
    print(f"Looking for stdlib usage in {args.path}...")
-    if args.path.is_file():
+    match_count = find_symbols_in_dir(args.path)
        match_count = find_symbols_in_file(args.path)
    else:
        match_count = find_symbols_in_dir(args.path)
    if match_count:
        print("If the stdlib usage is intentional, add a '// This should NOT be SDL_<symbol>()' line comment.")
--- a/build-scripts/create_tbds.py
+++ b/build-scripts/create_tbds.py
@@ -1,142 +0,0 @@
 #!/usr/bin/env python3
 import argparse
 import dataclasses
 import enum
 from pathlib import Path
 import json
 import subprocess
 import sys
 import tempfile
 SDL_ROOT = Path(__file__).resolve().parents[1]
@dataclasses.dataclass
 class TbdInfo:
    install_name: str
    target_infos: list[dict[str, str]]
 class TbdPlatform(enum.StrEnum):
    MACOS = "macOS"
    IOS = "iOS"
 TBDINFOS = {
    TbdPlatform.MACOS: TbdInfo(
        install_name="@rpath/SDL3.framework/Versions/A/SDL3",
        target_infos=[
            {
                "min_deployment": "10.13",
                "target": "arm64-macos",
            },
            {
                "min_deployment": "10.13",
                "target": "x86_64-macos",
            },
        ]
    ),
    TbdPlatform.IOS: TbdInfo(
        install_name="@rpath/SDL3.framework/SDL3",
        target_infos=[
            {
                "min_deployment": "11.0",
                "target": "arm64-ios",
            },
            {
                "min_deployment": "11.0",
                "target": "arm64-ios-simulator",
            },
            {
                "min_deployment": "11.0",
                "target": "x86_64-ios-simulator",
            },
            {
                "min_deployment": "11.0",
                "target": "arm64-tvos",
            },
            {
                "min_deployment": "11.0",
                "target": "arm64-tvos-simulator",
            },
            {
                "min_deployment": "11.0",
                "target": "x86_64-tvos-simulator",
            },
            {
                "min_deployment": "1.3",
                "target": "arm64-xros",
            },
            {
                "min_deployment": "1.3",
                "target": "arm64-xros-simulator",
            },
        ]
    ),
 }
 def create_sdl3_tbd(symbols: list[str], tbd_info: TbdInfo):
    return {
        "main_library": {
            "compatibility_versions": [
                {
                    "version": "201"
                }
            ],
            "current_versions": [
                {
                    "version": "201"
                }
            ],
            "exported_symbols": [
                {
                    "text": {
                        "global": symbols
                    }
                }
            ],
            "flags": [
                {
                    "attributes": [
                        "not_app_extension_safe"
                    ]
                }
            ],
            "install_names": [
                {
                    "name": tbd_info.install_name
                }
            ],
            "target_info": tbd_info.target_infos
        },
        "tapi_tbd_version": 5
    }
 def main():
    parser = argparse.ArgumentParser(allow_abbrev=False)
    parser.add_argument("--output", "-o", type=Path, help="Output path (default is stdout)")
    parser.add_argument("--platform", type=TbdPlatform, required=True,
        choices=[str(e) for e in TbdPlatform], help="Apple Platform")
    args = parser.parse_args()
    with tempfile.NamedTemporaryFile() as f_temp:
        f_temp.close()
        subprocess.check_call([sys.executable,SDL_ROOT / "src/dynapi/gendynapi.py", "--dump", f_temp.name],
            stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
        with open(f_temp.name) as f_json:
            sdl3_json = json.load(f_json)
    sdl3_macos_symbols = [f"_{symbol_info['name']}" for symbol_info in sdl3_json]
    sdl3_macos_symbols.sort()
    tbd = create_sdl3_tbd(symbols=sdl3_macos_symbols, tbd_info=TBDINFOS[args.platform])
    with (args.output.open("w", newline="") if args.output else sys.stdout) as f_out:
        json.dump(tbd, fp=f_out, indent=2)
        f_out.write("\n")
 if __name__ == "__main__":
    raise SystemExit(main())
--- a/build-scripts/mkinstalldirs
+++ b/build-scripts/mkinstalldirs
@@ -0,0 +1,162 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
 scriptversion=2020-07-26.22; # UTC
 # Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
 # Public domain.
 #
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 nl='
 '
 IFS=" ""	$nl"
 errstatus=0
 dirmode=
 usage="\
 Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
 Create each directory DIR (with mode MODE, if specified), including all
 leading file name components.
 Report bugs to <bug-automake@gnu.org>."
 # process command line arguments
 while test $# -gt 0 ; do
  case $1 in
    -h | --help | --h*)         # -h for help
      echo "$usage"
      exit $?
      ;;
    -m)                         # -m PERM arg
      shift
      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
      dirmode=$1
      shift
      ;;
    --version)
      echo "$0 $scriptversion"
      exit $?
      ;;
    --)                         # stop option processing
      shift
      break
      ;;
    -*)                         # unknown option
      echo "$usage" 1>&2
      exit 1
      ;;
    *)                          # first non-opt arg
      break
      ;;
  esac
 done
 for file
 do
  if test -d "$file"; then
    shift
  else
    break
  fi
 done
 case $# in
  0) exit 0 ;;
 esac
 # Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
 # mkdir -p a/c at the same time, both will detect that a is missing,
 # one will create a, then the other will try to create a and die with
 # a "File exists" error.  This is a problem when calling mkinstalldirs
 # from a parallel make.  We use --version in the probe to restrict
 # ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
  '')
    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
      echo "mkdir -p -- $*"
      exec mkdir -p -- "$@"
    else
      # On NextStep and OpenStep, the 'mkdir' command does not
      # recognize any option.  It will interpret all options as
      # directories to create, and then abort because '.' already
      # exists.
      test -d ./-p && rmdir ./-p
      test -d ./--version && rmdir ./--version
    fi
    ;;
  *)
    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
       test ! -d ./--version; then
      echo "umask 22"
      umask 22
      echo "mkdir -m $dirmode -p -- $*"
      exec mkdir -m "$dirmode" -p -- "$@"
    else
      # Clean up after NextStep and OpenStep mkdir.
      for d in ./-m ./-p ./--version "./$dirmode";
      do
        test -d $d && rmdir $d
      done
    fi
    ;;
 esac
 echo "umask 22"
 umask 22
 for file
 do
  case $file in
    /*) pathcomp=/ ;;
    *)  pathcomp= ;;
  esac
  oIFS=$IFS
  IFS=/
  set fnord $file
  shift
  IFS=$oIFS
  for d
  do
    test "x$d" = x && continue
    pathcomp=$pathcomp$d
    case $pathcomp in
      -*) pathcomp=./$pathcomp ;;
    esac
    if test ! -d "$pathcomp"; then
      echo "mkdir $pathcomp"
      mkdir "$pathcomp" || lasterr=$?
      if test ! -d "$pathcomp"; then
 	errstatus=$lasterr
      fi
    fi
    pathcomp=$pathcomp/
  done
  if test ! -z "$dirmode"; then
    echo "chmod $dirmode $file"
    chmod "$dirmode" "$file" || errstatus=$?
  fi
 done
 exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
--- a/build-scripts/pkg-support/android/aar/main.py.in
+++ b/build-scripts/pkg-support/android/aar/main.py.in
@@ -26,6 +26,7 @@ import zipfile
 AAR_PATH = pathlib.Path(__file__).resolve().parent
 ANDROID_ARCHS = { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" }
 def main():
--- a/build-scripts/pkg-support/source/SDL_revision.h.cmake.in
+++ b/build-scripts/pkg-support/source/SDL_revision.h.cmake.in
@@ -33,9 +33,9 @@
 #cmakedefine SDL_VENDOR_INFO "@SDL_VENDOR_INFO@"
 #if defined(SDL_VENDOR_INFO)
-#define SDL_REVISION "SDL-@<@PROJECT_REVISION@>@ (" SDL_VENDOR_INFO ")"
+#define SDL_REVISION "@<@PROJECT_REVISION@>@ (" SDL_VENDOR_INFO ")"
 #else
-#define SDL_REVISION "SDL-@<@PROJECT_REVISION@>@"
+#define SDL_REVISION "@<@PROJECT_REVISION@>@"
 #endif
 #endif /* SDL_revision_h_ */
--- a/build-scripts/pkg-support/source/SDL_revision.h.in
+++ b/build-scripts/pkg-support/source/SDL_revision.h.in
@@ -48,9 +48,9 @@
 */
 #define SDL_REVISION "Some arbitrary string decided at SDL build time"
 #elif defined(SDL_VENDOR_INFO)
-#define SDL_REVISION "SDL-@<@PROJECT_REVISION@>@ (" SDL_VENDOR_INFO ")"
+#define SDL_REVISION "@<@PROJECT_REVISION@>@ (" SDL_VENDOR_INFO ")"
 #else
-#define SDL_REVISION "SDL-@<@PROJECT_REVISION@>@"
+#define SDL_REVISION "@<@PROJECT_REVISION@>@"
 #endif
 #endif /* SDL_revision_h_ */
--- a/build-scripts/wikiheaders.pl
+++ b/build-scripts/wikiheaders.pl
@@ -32,16 +32,10 @@ my $wikisubdir = '';
 my $incsubdir = 'include';
 my $readmesubdir = undef;
 my $apiprefixregex = undef;
 my $apipropertyregex = undef;
 my $versionfname = 'include/SDL_version.h';
 my $versionmajorregex = '\A\#define\s+SDL_MAJOR_VERSION\s+(\d+)\Z';
 my $versionminorregex = '\A\#define\s+SDL_MINOR_VERSION\s+(\d+)\Z';
 my $versionmicroregex = '\A\#define\s+SDL_MICRO_VERSION\s+(\d+)\Z';
 my $wikidocsectionsym = 'SDL_WIKI_DOCUMENTATION_SECTION';
 my $forceinlinesym = 'SDL_FORCE_INLINE';
 my $deprecatedsym = 'SDL_DEPRECATED';
 my $declspecsym = '(?:SDLMAIN_|SDL_)?DECLSPEC';
 my $callconvsym = 'SDLCALL';
 my $mainincludefname = 'SDL.h';
 my $selectheaderregex = '\ASDL.*?\.h\Z';
 my $projecturl = 'https://libsdl.org/';
@@ -49,6 +43,7 @@ my $wikiurl = 'https://wiki.libsdl.org';
 my $bugreporturl = 'https://github.com/libsdl-org/sdlwiki/issues/new';
 my $srcpath = undef;
 my $wikipath = undef;
 my $wikireadmesubdir = 'README';
 my $warn_about_missing = 0;
 my $copy_direction = 0;
 my $optionsfname = undef;
@@ -63,11 +58,6 @@ my $quickreftitle = undef;
 my $quickrefurl = undef;
 my $quickrefdesc = undef;
 my $quickrefmacroregex = undef;
 my $envvarenabled = 0;
 my $envvartitle = 'Environment Variables';
 my $envvardesc = undef;
 my $envvarsymregex = undef;
 my $envvarsymreplace = undef;
 my $changeformat = undef;
 my $manpath = undef;
 my $gitrev = undef;
@@ -121,7 +111,6 @@ if (defined $optionsfname) {
            $srcpath = $val, next if $key eq 'srcpath';
            $wikipath = $val, next if $key eq 'wikipath';
            $apiprefixregex = $val, next if $key eq 'apiprefixregex';
            $apipropertyregex = $val, next if $key eq 'apipropertyregex';
            $projectfullname = $val, next if $key eq 'projectfullname';
            $projectshortname = $val, next if $key eq 'projectshortname';
            $wikisubdir = $val, next if $key eq 'wikisubdir';
@@ -147,17 +136,6 @@ if (defined $optionsfname) {
            $quickrefurl = $val, next if $key eq 'quickrefurl';
            $quickrefdesc = $val, next if $key eq 'quickrefdesc';
            $quickrefmacroregex = $val, next if $key eq 'quickrefmacroregex';
            $envvarenabled = int($val), next if $key eq 'envvarenabled';
            $envvartitle = $val, next if $key eq 'envvartitle';
            $envvardesc = $val, next if $key eq 'envvardesc';
            $envvarsymregex = $val, next if $key eq 'envvarsymregex';
            $envvarsymreplace = $val, next if $key eq 'envvarsymreplace';
            $wikidocsectionsym = $val, next if $key eq 'wikidocsectionsym';
            $forceinlinesym = $val, next if $key eq 'forceinlinesym';
            $deprecatedsym = $val, next if $key eq 'deprecatedsym';
            $declspecsym = $val, next if $key eq 'declspecsym';
            $callconvsym = $val, next if $key eq 'callconvsym';
        }
    }
    close(OPTIONS);
@@ -364,7 +342,7 @@ sub wikify_chunk {
        # Convert obvious API things to wikilinks.
        if (defined $apiprefixregex) {
-            $str =~ s/(\A|[^\/a-zA-Z0-9_\[])($apiprefixregex[a-zA-Z0-9_]+)/$1\[$2\]\($2\)/gms;
+            $str =~ s/(\A|[^\/a-zA-Z0-9_])($apiprefixregex[a-zA-Z0-9_]+)/$1\[$2\]\($2\)/gms;
        }
        $str = $codedstr . $str;
@@ -447,7 +425,6 @@ sub dewikify_chunk {
        }
    } elsif ($dewikify_mode eq 'manpage') {
        # make sure these can't become part of roff syntax.
        $str =~ s/\\/\\(rs/gms;
        $str =~ s/\./\\[char46]/gms;
        $str =~ s/"/\\(dq/gms;
        $str =~ s/'/\\(aq/gms;
@@ -761,7 +738,6 @@ sub print_undocumented_section {
    }
 }
 # !!! FIXME: generalize this for other libraries to use.
 sub strip_fn_declaration_metadata {
    my $decl = shift;
    $decl =~ s/SDL_(PRINTF|SCANF)_FORMAT_STRING\s*//;  # don't want this metadata as part of the documentation.
@@ -850,23 +826,21 @@ sub print_big_ascii_string {
            die("Don't have a big ascii entry for '$ch'!\n") if not defined $rowsref;
            my $row = @$rowsref[$rownum];
            my $outstr = '';
            if ($lowascii) {
                my @x = split //, $row;
                foreach (@x) {
-                    $outstr .= ($_ eq "\x{2588}") ? 'X' : ' ';
+                    my $v = ($_ eq "\x{2588}") ? 'X' : ' ';
                    print $fh $v;
                }
            } else {
-                $outstr = $row;
+                print $fh $row;
            }
            $charidx++;
-            if ($charidx == $charcount) {
+
-                $outstr =~ s/\s*\Z//;  # dump extra spaces at the end of the line.
+            if ($charidx < $charcount) {
-            } else {
+                print $fh " ";
                $outstr .= ' ';   # space between glyphs.
            }
            print $fh $outstr;
        }
        print $fh "\n";
    }
@@ -1057,58 +1031,10 @@ sub generate_quickref {
 }
 sub generate_envvar_wiki_page {
    my $briefsref = shift;
    my $path = shift;
    return if not $envvarenabled or not defined $envvarsymregex or not defined $envvarsymreplace;
    my $replace = "\"$envvarsymreplace\"";
    my $tmppath = "$path.tmp";
    open(my $fh, '>', $tmppath) or die("Can't open '$tmppath': $!\n");
    print $fh "<!-- DO NOT EDIT THIS PAGE ON THE WIKI. IT WILL BE OVERWRITTEN BY WIKIHEADERS AND CHANGES WILL BE LOST! -->\n\n";
    print $fh "# $envvartitle\n\n";
    if (defined $envvardesc) {
        my $desc = "$envvardesc";
        $desc =~ s/\\n/\n/g;  # replace "\n" strings with actual newlines.
        print $fh "$desc\n\n";
    }
    print $fh "## Environment Variable List\n\n";
    foreach (sort keys %headersyms) {
        my $sym = $_;
        next if $headersymstype{$sym} != 2;  # not a #define? skip it.
        my $hint = "$_";
        next if not $hint =~ s/$envvarsymregex/$replace/ee;
        my $brief = $$briefsref{$sym};
        if (not defined $brief) {
            $brief = '';
        } else {
            $brief = "$brief";
            chomp($brief);
            my $thiswikitype = defined $wikitypes{$sym} ? $wikitypes{$sym} : 'md';  # default to MarkDown for new stuff.
            $brief = ": " . dewikify($thiswikitype, $brief);
        }
        print $fh "- [$hint]($sym)$brief\n";
    }
    print $fh "\n";
    close($fh);
    rename($tmppath, $path) or die("Can't rename '$tmppath' to '$path': $!\n");
 }
 my $incpath = "$srcpath";
 $incpath .= "/$incsubdir" if $incsubdir ne '';
 my $wikireadmepath = "$wikipath/$wikireadmesubdir";
 my $readmepath = undef;
 if (defined $readmesubdir) {
    $readmepath = "$srcpath/$readmesubdir";
@@ -1165,7 +1091,7 @@ while (my $d = readdir(DH)) {
        } elsif ($ignoring_lines) {
            push @contents, $_;
            next;
-        } elsif (/\A\s*\#\s*ifndef\s+$wikidocsectionsym\s*\Z/) {
+        } elsif (/\A\s*\#\s*ifndef\s+SDL_WIKI_DOCUMENTATION_SECTION\s*\Z/) {
            $ignoring_lines = 1;
            push @contents, $_;
            next;
@@ -1174,13 +1100,13 @@ while (my $d = readdir(DH)) {
            #print("CATEGORY FOR '$dent' CHANGED TO " . (defined($current_wiki_category) ? "'$current_wiki_category'" : '(undef)') . "\n");
            push @contents, $_;
            next;
-        } elsif (/\A\s*extern\s+(?:$deprecatedsym\s+|)$declspecsym/) {  # a function declaration without a doxygen comment?
+        } elsif (/\A\s*extern\s+(SDL_DEPRECATED\s+|)(SDLMAIN_|SDL_)?DECLSPEC/) {  # a function declaration without a doxygen comment?
            $symtype = 1;   # function declaration
            @templines = ();
            $decl = $_;
            $str = '';
            $has_doxygen = 0;
-        } elsif (/\A\s*$forceinlinesym/) {  # a (forced-inline) function declaration without a doxygen comment?
+        } elsif (/\A\s*SDL_FORCE_INLINE/) {  # a (forced-inline) function declaration without a doxygen comment?
            $symtype = 1;   # function declaration
            @templines = ();
            $decl = $_;
@@ -1247,9 +1173,9 @@ while (my $d = readdir(DH)) {
                $lineno++ if defined $decl;
                $decl = '' if not defined $decl;
                chomp($decl);
-                if ($decl =~ /\A\s*extern\s+(?:$deprecatedsym\s+|)$declspecsym/) {
+                if ($decl =~ /\A\s*extern\s+(SDL_DEPRECATED\s+|)(SDLMAIN_|SDL_)?DECLSPEC/) {
                    $symtype = 1;   # function declaration
-                } elsif ($decl =~ /\A\s*$forceinlinesym/) {
+                } elsif ($decl =~ /\A\s*SDL_FORCE_INLINE/) {
                    $symtype = 1;   # (forced-inline) function declaration
                } elsif ($decl =~ /\A\s*\#\s*define\s+/) {
                    $symtype = 2;   # macro
@@ -1286,7 +1212,7 @@ while (my $d = readdir(DH)) {
            }
            $headercategorydocs{$current_wiki_category} = $sym;
        } elsif ($symtype == 1) {  # a function
-            my $is_forced_inline = ($decl =~ /\A\s*$forceinlinesym/);
+            my $is_forced_inline = ($decl =~ /\A\s*SDL_FORCE_INLINE/);
            if ($is_forced_inline) {
                if (not $decl =~ /\)\s*(\{.*|)\s*\Z/) {
@@ -1323,14 +1249,14 @@ while (my $d = readdir(DH)) {
            my $paramsstr = undef;
-            if (!$is_forced_inline && $decl =~ /\A\s*extern\s+(?:$deprecatedsym\s+|)$declspecsym\w*\s+(const\s+|)(unsigned\s+|)(.*?)([\*\s]+)(\*?)\s*$callconvsym\s+(.*?)\s*\((.*?)\);/) {
+            if (!$is_forced_inline && $decl =~ /\A\s*extern\s+(SDL_DEPRECATED\s+|)(SDLMAIN_|SDL_)?DECLSPEC\w*\s+(const\s+|)(unsigned\s+|)(.*?)([\*\s]+)(\*?)\s*SDLCALL\s+(.*?)\s*\((.*?)\);/) {
                $sym = $8;
                $rettype = "$3$4$5$6";
                $paramsstr = $9;
             } elsif ($is_forced_inline && $decl =~ /\A\s*SDL_FORCE_INLINE\s+(SDL_DEPRECATED\s+|)(const\s+|)(unsigned\s+|)(.*?)([\*\s]+)(.*?)\s*\((.*?)\);/) {
                $sym = $6;
-                $rettype = "$1$2$3$4$5";
+                $rettype = "$2$3$4$5";
                $paramsstr = $7;
             } elsif ($is_forced_inline && $decl =~ /\A\s*$forceinlinesym\s+(?:$deprecatedsym\s+|)(const\s+|)(unsigned\s+|)(.*?)([\*\s]+)(.*?)\s*\((.*?)\);/) {
                $sym = $5;
                $rettype = "$1$2$3$4";
                $paramsstr = $6;
             } else {
                #print "Found doxygen but no function sig:\n$str\n\n";
                foreach (@templines) {
@@ -1396,7 +1322,7 @@ while (my $d = readdir(DH)) {
                        $decl = $_;
                        $temp = $decl;
-                        $temp =~ s/\Aextern\s+(?:$deprecatedsym\s+|)$declspecsym\w*\s+(.*?)\s+(\*?)$callconvsym\s+/$1$2 /;
+                        $temp =~ s/\Aextern\s+(SDL_DEPRECATED\s+|)(SDLMAIN_|SDL_)?DECLSPEC\w*\s+(.*?)\s+(\*?)SDLCALL\s+/$3$4 /;
                        $shrink_length = length($decl) - length($temp);
                        $decl = $temp;
                    } else {
@@ -1440,7 +1366,7 @@ while (my $d = readdir(DH)) {
                    # update strings now that we know everything pending is to be applied to this declaration. Add pending blank lines and the new text.
                    # At Sam's request, don't list property defines with functions. (See #9440)
-                    my $is_property = (defined $apipropertyregex) ? /$apipropertyregex/ : 0;
+                    my $is_property = /\A\s*\#\s*define\s+SDL_PROP_/;
                    if (!$is_property) {
                        if ($blank_lines > 0) {
                            while ($blank_lines > 0) {
@@ -1461,7 +1387,7 @@ while (my $d = readdir(DH)) {
            }
            $decl .= $additional_decl;
        } elsif ($symtype == 2) {  # a macro
-            if ($decl =~ /\A\s*\#\s*define\s+(.*?)(\(.*?\)|)(\s+|\Z)/) {
+            if ($decl =~ /\A\s*\#\s*define\s+(.*?)(\(.*?\)|)\s+/) {
                $sym = $1;
            } else {
                #print "Found doxygen but no macro:\n$str\n\n";
@@ -2157,15 +2083,18 @@ if ($copy_direction == 1) {  # --copy-to-headers
    }
    if (defined $readmepath) {
-        mkdir($readmepath);  # just in case
+        if ( -d $wikireadmepath ) {
-        opendir(DH, $wikipath) or die("Can't opendir '$wikipath': $!\n");
+            mkdir($readmepath);  # just in case
-        while (readdir(DH)) {
+            opendir(DH, $wikireadmepath) or die("Can't opendir '$wikireadmepath': $!\n");
-            my $dent = $_;
+            while (readdir(DH)) {
-            if ($dent =~ /\A(README|INTRO)\-.*?\.md\Z/) {  # we only bridge Markdown files here that start with "README-" or "INTRO-".
+                my $dent = $_;
-                filecopy("$wikipath/$dent", "$readmepath/$dent", "\n");
+                if ($dent =~ /\A(.*?)\.md\Z/) {  # we only bridge Markdown files here.
                    next if $1 eq 'FrontPage';
                    filecopy("$wikireadmepath/$dent", "$readmepath/README-$dent", "\n");
                }
            }
            closedir(DH);
        }
        closedir(DH);
    }
 } elsif ($copy_direction == -1) { # --copy-to-wiki
@@ -2271,10 +2200,10 @@ if ($copy_direction == 1) {  # --copy-to-headers
                $desc =~ s/[\s\n]+\Z//ms;
-                if (0) {
+                if (0) {  # !!! FIXME: disabled because it's not currently suitable for general use, but for manually inspecting the output, it can be useful.
-                    if (($desc =~ /\A[a-z]/) && (not $desc =~ /$apiprefixregex/)) {
+                    if (($desc =~ /\A[A-Z]/) && (not $desc =~ /\ASDL_/)) {
-                        print STDERR "WARNING: $sym\'s '\\param $arg' text starts with a lowercase letter: '$desc'. Fixing.\n";
+                        print STDERR "WARNING: $sym\'s '\\param $arg' text starts with a capital letter: '$desc'. Fixing.\n";
-                        $desc = ucfirst($desc);
+                        $desc = lcfirst($desc);
                    }
                }
@@ -2318,8 +2247,8 @@ if ($copy_direction == 1) {  # --copy-to-headers
                }
                $desc =~ s/[\s\n]+\Z//ms;
-                if (0) {
+                if (0) {  # !!! FIXME: disabled because it's not currently suitable for general use, but for manually inspecting the output, it can be useful.
-                    if (($desc =~ /\A[A-Z]/) && (not $desc =~ /$apiprefixregex/)) {
+                    if (($desc =~ /\A[A-Z]/) && (not $desc =~ /\ASDL_/)) {
                        print STDERR "WARNING: $sym\'s '\\returns' text starts with a capital letter: '$desc'. Fixing.\n";
                        $desc = lcfirst($desc);
                    }
@@ -2463,7 +2392,7 @@ if ($copy_direction == 1) {  # --copy-to-headers
                } else {
                    die("Unexpected symbol type $symtype!");
                }
-                my $str = "This $symtypename is available since $projectshortname 3.0.0.";
+                my $str = "This $symtypename is available since SDL 3.0.0.";
                $sections{'Version'} = wordwrap(wikify($wikitype, $str)) . "\n";
            }
        }
@@ -2770,27 +2699,31 @@ __EOF__
    # Write out READMEs...
    if (defined $readmepath) {
        if ( -d $readmepath ) {
-            mkdir($wikipath);  # just in case
+            mkdir($wikireadmepath);  # just in case
            opendir(DH, $readmepath) or die("Can't opendir '$readmepath': $!\n");
            while (my $d = readdir(DH)) {
                my $dent = $d;
-                if ($dent =~ /\A(README|INTRO)\-.*?\.md\Z/) {  # we only bridge Markdown files here that start with "README-" or "INTRO".
+                if ($dent =~ /\AREADME\-(.*?\.md)\Z/) {  # we only bridge Markdown files here.
-                    filecopy("$readmepath/$dent", "$wikipath/$dent", "\n");
+                    my $wikifname = $1;
                    next if $wikifname eq 'FrontPage.md';
                    filecopy("$readmepath/$dent", "$wikireadmepath/$wikifname", "\n");
                }
            }
            closedir(DH);
            my @pages = ();
-            opendir(DH, $wikipath) or die("Can't opendir '$wikipath': $!\n");
+            opendir(DH, $wikireadmepath) or die("Can't opendir '$wikireadmepath': $!\n");
            while (my $d = readdir(DH)) {
                my $dent = $d;
-                if ($dent =~ /\A((README|INTRO)\-.*?)\.md\Z/) {
+                if ($dent =~ /\A(.*?)\.(mediawiki|md)\Z/) {
-                    push @pages, $1;
+                    my $wikiname = $1;
                    next if $wikiname eq 'FrontPage';
                    push @pages, $wikiname;
                }
            }
            closedir(DH);
-            open(FH, '>', "$wikipath/READMEs.md") or die("Can't open '$wikipath/READMEs.md': $!\n");
+            open(FH, '>', "$wikireadmepath/FrontPage.md") or die("Can't open '$wikireadmepath/FrontPage.md': $!\n");
            print FH "# All READMEs available here\n\n";
            foreach (sort @pages) {
                my $wikiname = $_;
@@ -2805,11 +2738,6 @@ __EOF__
        generate_quickref(\%briefs, "$wikipath/QuickReference.md", 0);
        generate_quickref(\%briefs, "$wikipath/QuickReferenceNoUnicode.md", 1);
    }
    if ($envvarenabled and defined $envvarsymregex and defined $envvarsymreplace) {
        generate_envvar_wiki_page(\%briefs, "$wikipath/EnvironmentVariables.md");
    }
 } elsif ($copy_direction == -2) { # --copy-to-manpages
    # This only takes from the wiki data, since it has sections we omit from the headers, like code examples.
@@ -2928,7 +2856,7 @@ __EOF__
        $str .= ".\\\" Please report issues in this manpage's content at:\n";
        $str .= ".\\\"   $bugreporturl\n";
        $str .= ".\\\" Please report issues in the generation of this manpage from the wiki at:\n";
-        $str .= ".\\\"   https://github.com/libsdl-org/SDL/issues/new?title=Misgenerated%20manpage%20for%20$sym\n";  # !!! FIXME: if this becomes a problem for other projects, we'll generalize this.
+        $str .= ".\\\"   https://github.com/libsdl-org/SDL/issues/new?title=Misgenerated%20manpage%20for%20$sym\n";
        $str .= ".\\\" $projectshortname can be found at $projecturl\n";
        # Define a .URL macro. The "www.tmac" thing decides if we're using GNU roff (which has a .URL macro already), and if so, overrides the macro we just created.
@@ -3053,12 +2981,10 @@ __EOF__
        }
        if (defined $returns) {
            # Check for md link in return type: ([SDL_Renderer](SDL_Renderer) *)
            # This would've prevented the next regex from working properly (it'd leave " *)")
            $returns =~ s/\A\(\[.*?\]\((.*?)\)/\($1/ms;
            # Chop datatype in parentheses off the front.
-            $returns =~ s/\A\(.*?\) //;
+            if(!($returns =~ s/\A\([^\[]*\[[^\]]*\]\([^\)]*\)[^\)]*\) //ms)) {
-
+                $returns =~ s/\A\([^\)]*\) //ms;
            }
            $returns = dewikify($wikitype, $returns);
            $str .= ".SH RETURN VALUE\n";
            $str .= "$returns\n";
--- a/cmake/FindLibUSB.cmake
+++ b/cmake/FindLibUSB.cmake
@@ -10,7 +10,7 @@ if(PKG_CONFIG_FOUND)
 endif()
 find_library(LibUSB_LIBRARY
-  NAMES usb-1.0 libusb-1.0 usb
+  NAMES usb-1.0 libusb-1.0
  HINTS ${PC_LibUSB_LIBRARY_DIRS}
 )
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -164,22 +164,6 @@ function(get_git_head_revision _refspecvar _hashvar)
                   "${GIT_DATA}/grabRef.cmake" @ONLY)
    include("${GIT_DATA}/grabRef.cmake")
    # Fallback for reftable or other storage formats
    if(NOT HEAD_HASH OR HEAD_HASH STREQUAL "")
        find_package(Git QUIET)
        if(GIT_FOUND)
            execute_process(
                COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
                RESULT_VARIABLE res
                OUTPUT_VARIABLE HEAD_HASH
                ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
            if(NOT res EQUAL 0)
                set(HEAD_HASH "")
            endif()
        endif()
    endif()
    set(${_refspecvar}
        "${HEAD_REF}"
        PARENT_SCOPE)
--- a/cmake/GetGitRevisionDescription.cmake.in
+++ b/cmake/GetGitRevisionDescription.cmake.in
@@ -25,21 +25,19 @@ if(HEAD_CONTENTS MATCHES "ref")
 	string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
 	if(EXISTS "@GIT_DIR@/${HEAD_REF}")
 		configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
-	elseif(EXISTS "@GIT_DIR@/packed-refs")
+	else()
 		configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
 		file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
 		if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
 			set(HEAD_HASH "${CMAKE_MATCH_1}")
 		endif()
 	elseif(EXISTS "@GIT_DIR@/reftable/tables.list")
 		configure_file("@GIT_DIR@/reftable/tables.list" "@GIT_DATA@/reftable-tables.list" COPYONLY)
 	endif()
 else()
 	# detached HEAD
 	configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
 endif()
-if(NOT HEAD_HASH AND EXISTS "@GIT_DATA@/head-ref")
+if(NOT HEAD_HASH)
 	file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
 	string(STRIP "${HEAD_HASH}" HEAD_HASH)
 endif()
--- a/cmake/PreseedEmscriptenCache.cmake
+++ b/cmake/PreseedEmscriptenCache.cmake
@@ -4,7 +4,6 @@ if(EMSCRIPTEN)
    set(HAVE_ALLOCA_H                                    "1"   CACHE INTERNAL "Have include alloca.h")
    set(HAVE_LIBM                                        "1"   CACHE INTERNAL "Have library m")
    set(HAVE_MALLOC                                      "1"   CACHE INTERNAL "Have include malloc.h")
    set(HAVE_MALLOC_H                                    "1"   CACHE INTERNAL "Have include malloc.h")
    set(LIBC_HAS_ABS                                     "1"   CACHE INTERNAL "Have symbol abs")
    set(LIBC_HAS_ACOS                                    "1"   CACHE INTERNAL "Have symbol acos")
    set(LIBC_HAS_ACOSF                                   "1"   CACHE INTERNAL "Have symbol acosf")
@@ -153,7 +152,7 @@ if(EMSCRIPTEN)
    set(HAVE_O_CLOEXEC                                   "1"   CACHE INTERNAL "Test HAVE_O_CLOEXEC")
    set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR             "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR")
    set(COMPILER_SUPPORTS_GCC_ATOMICS                    "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_GCC_ATOMICS")
-    set(HAVE_WL_VERSION_SCRIPT                           ""    CACHE INTERNAL "Test HAVE_WL_VERSION_SCRIPT")
+    set(LINKER_SUPPORTS_VERSION_SCRIPT                   ""    CACHE INTERNAL "Test LINKER_SUPPORTS_VERSION_SCRIPT")
    set(LINKER_SUPPORTS_WL_NO_UNDEFINED                  ""    CACHE INTERNAL "Test LINKER_SUPPORTS_WL_NO_UNDEFINED")
    set(ICONV_IN_LIBC                                    "1"   CACHE INTERNAL "Test ICONV_IN_LIBC")
    set(ICONV_IN_LIBICONV                                ""    CACHE INTERNAL "Test ICONV_IN_LIBICONV")
@@ -175,11 +174,5 @@ if(EMSCRIPTEN)
    set(HAVE_MEMFD_CREATE                                ""    CACHE INTERNAL "Have symbol memfd_create")
    set(HAVE_POSIX_FALLOCATE                             "1"   CACHE INTERNAL "Have symbol posix_fallocate")
    set(HAVE_DLOPEN_IN_LIBC                              "1"   CACHE INTERNAL "Have symbol dlopen")
    set(HAVE_FDATASYNC                                   "1"   CACHE INTERNAL "Have symbol fdatasync")
    set(HAVE_GETHOSTNAME                                 "1"   CACHE INTERNAL "Have symbol gethostname")
    set(HAVE_SIGTIMEDWAIT                                "1"   CACHE INTERNAL "Have symbol sigtimedwait")
    set(HAVE_PPOLL                                       ""    CACHE INTERNAL "Have symbol ppoll")
    set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR           ""    CACHE INTERNAL "Have symbol posix_spawn_file_actions_addchdir")
    set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP        "1"   CACHE INTERNAL "Have symbol posix_spawn_file_actions_addchdir_np")
  endfunction()
 endif()
--- a/cmake/PreseedMSVCCache.cmake
+++ b/cmake/PreseedMSVCCache.cmake
@@ -1,194 +1,183 @@
 if(MSVC)
  function(SDL_Preseed_CMakeCache)
-    check_c_source_compiles("
+    set(COMPILER_SUPPORTS_W3                             "1"   CACHE INTERNAL "Test /W3")
-      #include <sdkddkver.h>
+    set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR_ALWAYS      ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR_ALWAYS")
-      #if _WIN32_WINNT < 0x0A00
+    set(HAVE_ALLOCA_H                                    ""    CACHE INTERNAL "Have include alloca.h")
-      #error Preseeding is only supported for MSVC supporting Windows 10 or higher
+    set(HAVE_AUDIOCLIENT_H                               "1"   CACHE INTERNAL "Have include audioclient.h")
-      #endif
+    set(HAVE_D3D11_H                                     "1"   CACHE INTERNAL "Have include d3d11_1.h")
-      int main(int argc, char **argv) { return 0; }
+    set(HAVE_D3D9_H                                      "1"   CACHE INTERNAL "Have include d3d9.h")
-      " CAN_PRESEED
+    set(HAVE_DDRAW_H                                     "1"   CACHE INTERNAL "Have include ddraw.h")
-    )
+    set(HAVE_DINPUT_H                                    "1"   CACHE INTERNAL "Have include dinput.h")
-    if(CAN_PRESEED)
+    set(HAVE_DSOUND_H                                    "1"   CACHE INTERNAL "Have include dsound.h")
-      set(COMPILER_SUPPORTS_W3                             "1"   CACHE INTERNAL "Test /W3")
+    set(HAVE_DXGI_H                                      "1"   CACHE INTERNAL "Have include dxgi.h")
-      set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR_ALWAYS      ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR_ALWAYS")
+    set(HAVE_LIBM                                        ""    CACHE INTERNAL "Have library m")
-      set(HAVE_ALLOCA_H                                    ""    CACHE INTERNAL "Have include alloca.h")
+    set(HAVE_MALLOC                                      "1"   CACHE INTERNAL "Have include malloc.h")
-      set(HAVE_AUDIOCLIENT_H                               "1"   CACHE INTERNAL "Have include audioclient.h")
+    set(HAVE_MMDEVICEAPI_H                               "1"   CACHE INTERNAL "Have include mmdeviceapi.h")
-      set(HAVE_D3D11_H                                     "1"   CACHE INTERNAL "Have include d3d11_1.h")
+    set(HAVE_SENSORSAPI_H                                "1"   CACHE INTERNAL "Have include sensorsapi.h")
-      set(HAVE_D3D9_H                                      "1"   CACHE INTERNAL "Have include d3d9.h")
+    set(HAVE_SHELLSCALINGAPI_H                           "1"   CACHE INTERNAL "Have include shellscalingapi.h")
-      set(HAVE_DDRAW_H                                     "1"   CACHE INTERNAL "Have include ddraw.h")
+    set(HAVE_TPCSHRD_H                                   "1"   CACHE INTERNAL "Have include tpcshrd.h")
-      set(HAVE_DINPUT_H                                    "1"   CACHE INTERNAL "Have include dinput.h")
+    set(HAVE_WIN32_CC                                    "1"   CACHE INTERNAL "Test HAVE_WIN32_CC")
-      set(HAVE_DSOUND_H                                    "1"   CACHE INTERNAL "Have include dsound.h")
+    set(HAVE_XINPUT_H                                    "1"   CACHE INTERNAL "Test HAVE_XINPUT_H")
-      set(HAVE_DXGI_H                                      "1"   CACHE INTERNAL "Have include dxgi.h")
+    set(LIBC_HAS_ABS                                     "1"   CACHE INTERNAL "Have symbol abs")
-      set(HAVE_LIBM                                        ""    CACHE INTERNAL "Have library m")
+    set(LIBC_HAS_ACOS                                    "1"   CACHE INTERNAL "Have symbol acos")
-      set(HAVE_MALLOC                                      "1"   CACHE INTERNAL "Have include malloc.h")
+    set(LIBC_HAS_ACOSF                                   "1"   CACHE INTERNAL "Have symbol acosf")
-      set(HAVE_MALLOC_H                                    "1"   CACHE INTERNAL "Have include malloc.h")
+    set(LIBC_HAS_ASIN                                    "1"   CACHE INTERNAL "Have symbol asin")
-      set(HAVE_MMDEVICEAPI_H                               "1"   CACHE INTERNAL "Have include mmdeviceapi.h")
+    set(LIBC_HAS_ASINF                                   "1"   CACHE INTERNAL "Have symbol asinf")
-      set(HAVE_SENSORSAPI_H                                "1"   CACHE INTERNAL "Have include sensorsapi.h")
+    set(LIBC_HAS_ATAN                                    "1"   CACHE INTERNAL "Have symbol atan")
-      set(HAVE_SHELLSCALINGAPI_H                           "1"   CACHE INTERNAL "Have include shellscalingapi.h")
+    set(LIBC_HAS_ATAN2                                   "1"   CACHE INTERNAL "Have symbol atan2")
-      set(HAVE_TPCSHRD_H                                   "1"   CACHE INTERNAL "Have include tpcshrd.h")
+    set(LIBC_HAS_ATAN2F                                  "1"   CACHE INTERNAL "Have symbol atan2f")
-      set(HAVE_WIN32_CC                                    "1"   CACHE INTERNAL "Test HAVE_WIN32_CC")
+    set(LIBC_HAS_ATANF                                   "1"   CACHE INTERNAL "Have symbol atanf")
-      set(HAVE_XINPUT_H                                    "1"   CACHE INTERNAL "Test HAVE_XINPUT_H")
+    set(LIBC_HAS_ATOF                                    "1"   CACHE INTERNAL "Have symbol atof")
-      set(LIBC_HAS_ABS                                     "1"   CACHE INTERNAL "Have symbol abs")
+    set(LIBC_HAS_ATOI                                    "1"   CACHE INTERNAL "Have symbol atoi")
-      set(LIBC_HAS_ACOS                                    "1"   CACHE INTERNAL "Have symbol acos")
+    set(LIBC_HAS_BCOPY                                   ""    CACHE INTERNAL "Have symbol bcopy")
-      set(LIBC_HAS_ACOSF                                   "1"   CACHE INTERNAL "Have symbol acosf")
+    set(LIBC_HAS_CALLOC                                  "1"   CACHE INTERNAL "Have symbol calloc")
-      set(LIBC_HAS_ASIN                                    "1"   CACHE INTERNAL "Have symbol asin")
+    set(LIBC_HAS_CEIL                                    "1"   CACHE INTERNAL "Have symbol ceil")
-      set(LIBC_HAS_ASINF                                   "1"   CACHE INTERNAL "Have symbol asinf")
+    set(LIBC_HAS_CEILF                                   "1"   CACHE INTERNAL "Have symbol ceilf")
-      set(LIBC_HAS_ATAN                                    "1"   CACHE INTERNAL "Have symbol atan")
+    set(LIBC_HAS_COPYSIGN                                "1"   CACHE INTERNAL "Have symbol copysign")
-      set(LIBC_HAS_ATAN2                                   "1"   CACHE INTERNAL "Have symbol atan2")
+    set(LIBC_HAS_COPYSIGNF                               "1"   CACHE INTERNAL "Have symbol copysignf")
-      set(LIBC_HAS_ATAN2F                                  "1"   CACHE INTERNAL "Have symbol atan2f")
+    set(LIBC_HAS_COS                                     "1"   CACHE INTERNAL "Have symbol cos")
-      set(LIBC_HAS_ATANF                                   "1"   CACHE INTERNAL "Have symbol atanf")
+    set(LIBC_HAS_COSF                                    "1"   CACHE INTERNAL "Have symbol cosf")
-      set(LIBC_HAS_ATOF                                    "1"   CACHE INTERNAL "Have symbol atof")
+    set(LIBC_HAS_EXP                                     "1"   CACHE INTERNAL "Have symbol exp")
-      set(LIBC_HAS_ATOI                                    "1"   CACHE INTERNAL "Have symbol atoi")
+    set(LIBC_HAS_EXPF                                    "1"   CACHE INTERNAL "Have symbol expf")
-      set(LIBC_HAS_BCOPY                                   ""    CACHE INTERNAL "Have symbol bcopy")
+    set(LIBC_HAS_FABS                                    "1"   CACHE INTERNAL "Have symbol fabs")
-      set(LIBC_HAS_CALLOC                                  "1"   CACHE INTERNAL "Have symbol calloc")
+    set(LIBC_HAS_FABSF                                   "1"   CACHE INTERNAL "Have symbol fabsf")
-      set(LIBC_HAS_CEIL                                    "1"   CACHE INTERNAL "Have symbol ceil")
+    set(LIBC_HAS_FLOAT_H                                 "1"   CACHE INTERNAL "Have include float.h")
-      set(LIBC_HAS_CEILF                                   "1"   CACHE INTERNAL "Have symbol ceilf")
+    set(LIBC_HAS_FLOOR                                   "1"   CACHE INTERNAL "Have symbol floor")
-      set(LIBC_HAS_COPYSIGN                                "1"   CACHE INTERNAL "Have symbol copysign")
+    set(LIBC_HAS_FLOORF                                  "1"   CACHE INTERNAL "Have symbol floorf")
-      set(LIBC_HAS_COPYSIGNF                               "1"   CACHE INTERNAL "Have symbol copysignf")
+    set(LIBC_HAS_FMOD                                    "1"   CACHE INTERNAL "Have symbol fmod")
-      set(LIBC_HAS_COS                                     "1"   CACHE INTERNAL "Have symbol cos")
+    set(LIBC_HAS_FMODF                                   "1"   CACHE INTERNAL "Have symbol fmodf")
-      set(LIBC_HAS_COSF                                    "1"   CACHE INTERNAL "Have symbol cosf")
+    set(LIBC_HAS_FOPEN64                                 ""    CACHE INTERNAL "Have symbol fopen64")
-      set(LIBC_HAS_EXP                                     "1"   CACHE INTERNAL "Have symbol exp")
+    set(LIBC_HAS_FREE                                    "1"   CACHE INTERNAL "Have symbol free")
-      set(LIBC_HAS_EXPF                                    "1"   CACHE INTERNAL "Have symbol expf")
+    set(LIBC_HAS_FSEEKO                                  ""    CACHE INTERNAL "Have symbol fseeko")
-      set(LIBC_HAS_FABS                                    "1"   CACHE INTERNAL "Have symbol fabs")
+    set(LIBC_HAS_FSEEKO64                                ""    CACHE INTERNAL "Have symbol fseeko64")
-      set(LIBC_HAS_FABSF                                   "1"   CACHE INTERNAL "Have symbol fabsf")
+    set(LIBC_HAS_GETENV                                  "1"   CACHE INTERNAL "Have symbol getenv")
-      set(LIBC_HAS_FLOAT_H                                 "1"   CACHE INTERNAL "Have include float.h")
+    set(LIBC_HAS_ICONV_H                                 ""    CACHE INTERNAL "Have include iconv.h")
-      set(LIBC_HAS_FLOOR                                   "1"   CACHE INTERNAL "Have symbol floor")
+    set(LIBC_HAS_INDEX                                   ""    CACHE INTERNAL "Have symbol index")
-      set(LIBC_HAS_FLOORF                                  "1"   CACHE INTERNAL "Have symbol floorf")
+    set(LIBC_HAS_INTTYPES_H                              "1"   CACHE INTERNAL "Have include inttypes.h")
-      set(LIBC_HAS_FMOD                                    "1"   CACHE INTERNAL "Have symbol fmod")
+    set(LIBC_HAS_ISINF                                   "1"   CACHE INTERNAL "Have include isinf(double)")
-      set(LIBC_HAS_FMODF                                   "1"   CACHE INTERNAL "Have symbol fmodf")
+    set(LIBC_ISINF_HANDLES_FLOAT                         "1"   CACHE INTERNAL "Have include isinf(float)")
-      set(LIBC_HAS_FOPEN64                                 ""    CACHE INTERNAL "Have symbol fopen64")
+    set(LIBC_HAS_ISINFF                                  ""    CACHE INTERNAL "Have include isinff(float)")
-      set(LIBC_HAS_FREE                                    "1"   CACHE INTERNAL "Have symbol free")
+    set(LIBC_HAS_ISNAN                                   "1"   CACHE INTERNAL "Have include isnan(double)")
-      set(LIBC_HAS_FSEEKO                                  ""    CACHE INTERNAL "Have symbol fseeko")
+    set(LIBC_ISNAN_HANDLES_FLOAT                         "1"   CACHE INTERNAL "Have include isnan(float)")
-      set(LIBC_HAS_FSEEKO64                                ""    CACHE INTERNAL "Have symbol fseeko64")
+    set(LIBC_HAS_ISNANF                                  ""    CACHE INTERNAL "Have include isnanf(float)")
-      set(LIBC_HAS_GETENV                                  "1"   CACHE INTERNAL "Have symbol getenv")
+    set(LIBC_HAS_ITOA                                    "1"   CACHE INTERNAL "Have symbol itoa")
-      set(LIBC_HAS_ICONV_H                                 ""    CACHE INTERNAL "Have include iconv.h")
+    set(LIBC_HAS_LIMITS_H                                "1"   CACHE INTERNAL "Have include limits.h")
-      set(LIBC_HAS_INDEX                                   ""    CACHE INTERNAL "Have symbol index")
+    set(LIBC_HAS_LOG                                     "1"   CACHE INTERNAL "Have symbol log")
-      set(LIBC_HAS_INTTYPES_H                              "1"   CACHE INTERNAL "Have include inttypes.h")
+    set(LIBC_HAS_LOG10                                   "1"   CACHE INTERNAL "Have symbol log10")
-      set(LIBC_HAS_ISINF                                   "1"   CACHE INTERNAL "Have include isinf(double)")
+    set(LIBC_HAS_LOG10F                                  "1"   CACHE INTERNAL "Have symbol log10f")
-      set(LIBC_ISINF_HANDLES_FLOAT                         "1"   CACHE INTERNAL "Have include isinf(float)")
+    set(LIBC_HAS_LOGF                                    "1"   CACHE INTERNAL "Have symbol logf")
-      set(LIBC_HAS_ISINFF                                  ""    CACHE INTERNAL "Have include isinff(float)")
+    set(LIBC_HAS_LROUND                                  "1"   CACHE INTERNAL "Have symbol lround")
-      set(LIBC_HAS_ISNAN                                   "1"   CACHE INTERNAL "Have include isnan(double)")
+    set(LIBC_HAS_LROUNDF                                 "1"   CACHE INTERNAL "Have symbol lroundf")
-      set(LIBC_ISNAN_HANDLES_FLOAT                         "1"   CACHE INTERNAL "Have include isnan(float)")
+    set(LIBC_HAS_MALLOC                                  "1"   CACHE INTERNAL "Have symbol malloc")
-      set(LIBC_HAS_ISNANF                                  ""    CACHE INTERNAL "Have include isnanf(float)")
+    set(LIBC_HAS_MALLOC_H                                "1"   CACHE INTERNAL "Have include malloc.h")
-      set(LIBC_HAS_ITOA                                    "1"   CACHE INTERNAL "Have symbol itoa")
+    set(LIBC_HAS_MATH_H                                  "1"   CACHE INTERNAL "Have include math.h")
-      set(LIBC_HAS_LIMITS_H                                "1"   CACHE INTERNAL "Have include limits.h")
+    set(LIBC_HAS_MEMCMP                                  "1"   CACHE INTERNAL "Have symbol memcmp")
-      set(LIBC_HAS_LOG                                     "1"   CACHE INTERNAL "Have symbol log")
+    set(LIBC_HAS_MEMCPY                                  "1"   CACHE INTERNAL "Have symbol memcpy")
-      set(LIBC_HAS_LOG10                                   "1"   CACHE INTERNAL "Have symbol log10")
+    set(LIBC_HAS_MEMMOVE                                 "1"   CACHE INTERNAL "Have symbol memmove")
-      set(LIBC_HAS_LOG10F                                  "1"   CACHE INTERNAL "Have symbol log10f")
+    set(LIBC_HAS_MEMORY_H                                "1"   CACHE INTERNAL "Have include memory.h")
-      set(LIBC_HAS_LOGF                                    "1"   CACHE INTERNAL "Have symbol logf")
+    set(LIBC_HAS_MEMSET                                  "1"   CACHE INTERNAL "Have symbol memset")
-      set(LIBC_HAS_LROUND                                  "1"   CACHE INTERNAL "Have symbol lround")
+    set(LIBC_HAS_MODF                                    "1"   CACHE INTERNAL "Have symbol modf")
-      set(LIBC_HAS_LROUNDF                                 "1"   CACHE INTERNAL "Have symbol lroundf")
+    set(LIBC_HAS_MODFF                                   "1"   CACHE INTERNAL "Have symbol modff")
-      set(LIBC_HAS_MALLOC                                  "1"   CACHE INTERNAL "Have symbol malloc")
+    set(LIBC_HAS_POW                                     "1"   CACHE INTERNAL "Have symbol pow")
-      set(LIBC_HAS_MALLOC_H                                "1"   CACHE INTERNAL "Have include malloc.h")
+    set(LIBC_HAS_POWF                                    "1"   CACHE INTERNAL "Have symbol powf")
-      set(LIBC_HAS_MATH_H                                  "1"   CACHE INTERNAL "Have include math.h")
+    set(LIBC_HAS_PUTENV                                  "1"   CACHE INTERNAL "Have symbol putenv")
-      set(LIBC_HAS_MEMCMP                                  "1"   CACHE INTERNAL "Have symbol memcmp")
+    set(LIBC_HAS_REALLOC                                 "1"   CACHE INTERNAL "Have symbol realloc")
-      set(LIBC_HAS_MEMCPY                                  "1"   CACHE INTERNAL "Have symbol memcpy")
+    set(LIBC_HAS_RINDEX                                  ""    CACHE INTERNAL "Have symbol rindex")
-      set(LIBC_HAS_MEMMOVE                                 "1"   CACHE INTERNAL "Have symbol memmove")
+    set(LIBC_HAS_ROUND                                   "1"   CACHE INTERNAL "Have symbol round")
-      set(LIBC_HAS_MEMORY_H                                "1"   CACHE INTERNAL "Have include memory.h")
+    set(LIBC_HAS_ROUNDF                                  "1"   CACHE INTERNAL "Have symbol roundf")
-      set(LIBC_HAS_MEMSET                                  "1"   CACHE INTERNAL "Have symbol memset")
+    set(LIBC_HAS_SCALBN                                  "1"   CACHE INTERNAL "Have symbol scalbn")
-      set(LIBC_HAS_MODF                                    "1"   CACHE INTERNAL "Have symbol modf")
+    set(LIBC_HAS_SCALBNF                                 "1"   CACHE INTERNAL "Have symbol scalbnf")
-      set(LIBC_HAS_MODFF                                   "1"   CACHE INTERNAL "Have symbol modff")
+    set(LIBC_HAS_SETENV                                  ""    CACHE INTERNAL "Have symbol setenv")
-      set(LIBC_HAS_POW                                     "1"   CACHE INTERNAL "Have symbol pow")
+    set(LIBC_HAS_SIGNAL_H                                "1"   CACHE INTERNAL "Have include signal.h")
-      set(LIBC_HAS_POWF                                    "1"   CACHE INTERNAL "Have symbol powf")
+    set(LIBC_HAS_SIN                                     "1"   CACHE INTERNAL "Have symbol sin")
-      set(LIBC_HAS_PUTENV                                  "1"   CACHE INTERNAL "Have symbol putenv")
+    set(LIBC_HAS_SINF                                    "1"   CACHE INTERNAL "Have symbol sinf")
-      set(LIBC_HAS_REALLOC                                 "1"   CACHE INTERNAL "Have symbol realloc")
+    set(LIBC_HAS_SQR                                     ""    CACHE INTERNAL "Have symbol sqr")
-      set(LIBC_HAS_RINDEX                                  ""    CACHE INTERNAL "Have symbol rindex")
+    set(LIBC_HAS_SQRT                                    "1"   CACHE INTERNAL "Have symbol sqrt")
-      set(LIBC_HAS_ROUND                                   "1"   CACHE INTERNAL "Have symbol round")
+    set(LIBC_HAS_SQRTF                                   "1"   CACHE INTERNAL "Have symbol sqrtf")
-      set(LIBC_HAS_ROUNDF                                  "1"   CACHE INTERNAL "Have symbol roundf")
+    set(LIBC_HAS_SSCANF                                  "1"   CACHE INTERNAL "Have symbol sscanf")
-      set(LIBC_HAS_SCALBN                                  "1"   CACHE INTERNAL "Have symbol scalbn")
+    set(LIBC_HAS_STDARG_H                                "1"   CACHE INTERNAL "Have include stdarg.h")
-      set(LIBC_HAS_SCALBNF                                 "1"   CACHE INTERNAL "Have symbol scalbnf")
+    set(LIBC_HAS_STDBOOL_H                               "1"   CACHE INTERNAL "Have include stdbool.h")
-      set(LIBC_HAS_SETENV                                  ""    CACHE INTERNAL "Have symbol setenv")
+    set(LIBC_HAS_STDDEF_H                                "1"   CACHE INTERNAL "Have include stddef.h")
-      set(LIBC_HAS_SIGNAL_H                                "1"   CACHE INTERNAL "Have include signal.h")
+    set(LIBC_HAS_STDINT_H                                "1"   CACHE INTERNAL "Have include stdint.h")
-      set(LIBC_HAS_SIN                                     "1"   CACHE INTERNAL "Have symbol sin")
+    set(LIBC_HAS_STDIO_H                                 "1"   CACHE INTERNAL "Have include stdio.h")
-      set(LIBC_HAS_SINF                                    "1"   CACHE INTERNAL "Have symbol sinf")
+    set(LIBC_HAS_STDLIB_H                                "1"   CACHE INTERNAL "Have include stdlib.h")
-      set(LIBC_HAS_SQR                                     ""    CACHE INTERNAL "Have symbol sqr")
+    set(LIBC_HAS_STRCHR                                  "1"   CACHE INTERNAL "Have symbol strchr")
-      set(LIBC_HAS_SQRT                                    "1"   CACHE INTERNAL "Have symbol sqrt")
+    set(LIBC_HAS_STRCMP                                  "1"   CACHE INTERNAL "Have symbol strcmp")
-      set(LIBC_HAS_SQRTF                                   "1"   CACHE INTERNAL "Have symbol sqrtf")
+    set(LIBC_HAS_STRINGS_H                               ""    CACHE INTERNAL "Have include strings.h")
-      set(LIBC_HAS_SSCANF                                  "1"   CACHE INTERNAL "Have symbol sscanf")
+    set(LIBC_HAS_STRING_H                                "1"   CACHE INTERNAL "Have include string.h")
-      set(LIBC_HAS_STDARG_H                                "1"   CACHE INTERNAL "Have include stdarg.h")
+    set(LIBC_HAS_STRLCAT                                 ""    CACHE INTERNAL "Have symbol strlcat")
-      set(LIBC_HAS_STDBOOL_H                               "1"   CACHE INTERNAL "Have include stdbool.h")
+    set(LIBC_HAS_STRLCPY                                 ""    CACHE INTERNAL "Have symbol strlcpy")
-      set(LIBC_HAS_STDDEF_H                                "1"   CACHE INTERNAL "Have include stddef.h")
+    set(LIBC_HAS_STRLEN                                  "1"   CACHE INTERNAL "Have symbol strlen")
-      set(LIBC_HAS_STDINT_H                                "1"   CACHE INTERNAL "Have include stdint.h")
+    set(LIBC_HAS_STRNCMP                                 "1"   CACHE INTERNAL "Have symbol strncmp")
-      set(LIBC_HAS_STDIO_H                                 "1"   CACHE INTERNAL "Have include stdio.h")
+    set(LIBC_HAS_STRNLEN                                 "1"   CACHE INTERNAL "Have symbol strnlen")
-      set(LIBC_HAS_STDLIB_H                                "1"   CACHE INTERNAL "Have include stdlib.h")
+    set(LIBC_HAS_STRNSTR                                 ""    CACHE INTERNAL "Have symbol strnstr")
-      set(LIBC_HAS_STRCHR                                  "1"   CACHE INTERNAL "Have symbol strchr")
+    set(LIBC_HAS_STRPBRK                                 "1"   CACHE INTERNAL "Have symbol strpbrk")
-      set(LIBC_HAS_STRCMP                                  "1"   CACHE INTERNAL "Have symbol strcmp")
+    set(LIBC_HAS_STRRCHR                                 "1"   CACHE INTERNAL "Have symbol strrchr")
-      set(LIBC_HAS_STRINGS_H                               ""    CACHE INTERNAL "Have include strings.h")
+    set(LIBC_HAS_STRSTR                                  "1"   CACHE INTERNAL "Have symbol strstr")
-      set(LIBC_HAS_STRING_H                                "1"   CACHE INTERNAL "Have include string.h")
+    set(LIBC_HAS_STRTOD                                  "1"   CACHE INTERNAL "Have symbol strtod")
-      set(LIBC_HAS_STRLCAT                                 ""    CACHE INTERNAL "Have symbol strlcat")
+    set(LIBC_HAS_STRTOK_R                                ""    CACHE INTERNAL "Have symbol strtok_r")
-      set(LIBC_HAS_STRLCPY                                 ""    CACHE INTERNAL "Have symbol strlcpy")
+    set(LIBC_HAS_STRTOL                                  "1"   CACHE INTERNAL "Have symbol strtol")
-      set(LIBC_HAS_STRLEN                                  "1"   CACHE INTERNAL "Have symbol strlen")
+    set(LIBC_HAS_STRTOLL                                 "1"   CACHE INTERNAL "Have symbol strtoll")
-      set(LIBC_HAS_STRNCMP                                 "1"   CACHE INTERNAL "Have symbol strncmp")
+    set(LIBC_HAS_STRTOUL                                 "1"   CACHE INTERNAL "Have symbol strtoul")
-      set(LIBC_HAS_STRNLEN                                 "1"   CACHE INTERNAL "Have symbol strnlen")
+    set(LIBC_HAS_STRTOULL                                "1"   CACHE INTERNAL "Have symbol strtoull")
-      set(LIBC_HAS_STRNSTR                                 ""    CACHE INTERNAL "Have symbol strnstr")
+    set(LIBC_HAS_SYS_TYPES_H                             "1"   CACHE INTERNAL "Have include sys/types.h")
-      set(LIBC_HAS_STRPBRK                                 "1"   CACHE INTERNAL "Have symbol strpbrk")
+    set(LIBC_HAS_TAN                                     "1"   CACHE INTERNAL "Have symbol tan")
-      set(LIBC_HAS_STRRCHR                                 "1"   CACHE INTERNAL "Have symbol strrchr")
+    set(LIBC_HAS_TANF                                    "1"   CACHE INTERNAL "Have symbol tanf")
-      set(LIBC_HAS_STRSTR                                  "1"   CACHE INTERNAL "Have symbol strstr")
+    set(LIBC_HAS_TIME_H                                  "1"   CACHE INTERNAL "Have include time.h")
-      set(LIBC_HAS_STRTOD                                  "1"   CACHE INTERNAL "Have symbol strtod")
+    set(LIBC_HAS_TRUNC                                   "1"   CACHE INTERNAL "Have symbol trunc")
-      set(LIBC_HAS_STRTOK_R                                ""    CACHE INTERNAL "Have symbol strtok_r")
+    set(LIBC_HAS_TRUNCF                                  "1"   CACHE INTERNAL "Have symbol truncf")
-      set(LIBC_HAS_STRTOL                                  "1"   CACHE INTERNAL "Have symbol strtol")
+    set(LIBC_HAS_UNSETENV                                ""    CACHE INTERNAL "Have symbol unsetenv")
-      set(LIBC_HAS_STRTOLL                                 "1"   CACHE INTERNAL "Have symbol strtoll")
+    set(LIBC_HAS_VSNPRINTF                               "1"   CACHE INTERNAL "Have symbol vsnprintf")
-      set(LIBC_HAS_STRTOUL                                 "1"   CACHE INTERNAL "Have symbol strtoul")
+    set(LIBC_HAS_VSSCANF                                 "1"   CACHE INTERNAL "Have symbol vsscanf")
-      set(LIBC_HAS_STRTOULL                                "1"   CACHE INTERNAL "Have symbol strtoull")
+    set(LIBC_HAS_WCHAR_H                                 "1"   CACHE INTERNAL "Have include wchar.h")
-      set(LIBC_HAS_SYS_TYPES_H                             "1"   CACHE INTERNAL "Have include sys/types.h")
+    set(LIBC_HAS_WCSCMP                                  "1"   CACHE INTERNAL "Have symbol wcscmp")
-      set(LIBC_HAS_TAN                                     "1"   CACHE INTERNAL "Have symbol tan")
+    set(LIBC_HAS_WCSDUP                                  "1"   CACHE INTERNAL "Have symbol wcsdup")
-      set(LIBC_HAS_TANF                                    "1"   CACHE INTERNAL "Have symbol tanf")
+    set(LIBC_HAS_WCSLCAT                                 ""    CACHE INTERNAL "Have symbol wcslcat")
-      set(LIBC_HAS_TIME_H                                  "1"   CACHE INTERNAL "Have include time.h")
+    set(LIBC_HAS_WCSLCPY                                 ""    CACHE INTERNAL "Have symbol wcslcpy")
-      set(LIBC_HAS_TRUNC                                   "1"   CACHE INTERNAL "Have symbol trunc")
+    set(LIBC_HAS_WCSLEN                                  "1"   CACHE INTERNAL "Have symbol wcslen")
-      set(LIBC_HAS_TRUNCF                                  "1"   CACHE INTERNAL "Have symbol truncf")
+    set(LIBC_HAS_WCSNCMP                                 "1"   CACHE INTERNAL "Have symbol wcsncmp")
-      set(LIBC_HAS_UNSETENV                                ""    CACHE INTERNAL "Have symbol unsetenv")
+    set(LIBC_HAS_WCSNLEN                                 "1"   CACHE INTERNAL "Have symbol wcsnlen")
-      set(LIBC_HAS_VSNPRINTF                               "1"   CACHE INTERNAL "Have symbol vsnprintf")
+    set(LIBC_HAS_WCSSTR                                  "1"   CACHE INTERNAL "Have symbol wcsstr")
-      set(LIBC_HAS_VSSCANF                                 "1"   CACHE INTERNAL "Have symbol vsscanf")
+    set(LIBC_HAS_WCSTOL                                  "1"   CACHE INTERNAL "Have symbol wcstol")
-      set(LIBC_HAS_WCHAR_H                                 "1"   CACHE INTERNAL "Have include wchar.h")
+    set(LIBC_HAS__EXIT                                   "1"   CACHE INTERNAL "Have symbol _Exit")
-      set(LIBC_HAS_WCSCMP                                  "1"   CACHE INTERNAL "Have symbol wcscmp")
+    set(LIBC_HAS__I64TOA                                 "1"   CACHE INTERNAL "Have symbol _i64toa")
-      set(LIBC_HAS_WCSDUP                                  "1"   CACHE INTERNAL "Have symbol wcsdup")
+    set(LIBC_HAS__LTOA                                   "1"   CACHE INTERNAL "Have symbol _ltoa")
-      set(LIBC_HAS_WCSLCAT                                 ""    CACHE INTERNAL "Have symbol wcslcat")
+    set(LIBC_HAS__STRREV                                 "1"   CACHE INTERNAL "Have symbol _strrev")
-      set(LIBC_HAS_WCSLCPY                                 ""    CACHE INTERNAL "Have symbol wcslcpy")
+    set(LIBC_HAS__UI64TOA                                "1"   CACHE INTERNAL "Have symbol _ui64toa")
-      set(LIBC_HAS_WCSLEN                                  "1"   CACHE INTERNAL "Have symbol wcslen")
+    set(LIBC_HAS__UITOA                                  ""    CACHE INTERNAL "Have symbol _uitoa")
-      set(LIBC_HAS_WCSNCMP                                 "1"   CACHE INTERNAL "Have symbol wcsncmp")
+    set(LIBC_HAS__ULTOA                                  "1"   CACHE INTERNAL "Have symbol _ultoa")
-      set(LIBC_HAS_WCSNLEN                                 "1"   CACHE INTERNAL "Have symbol wcsnlen")
+    set(LIBC_HAS__WCSDUP                                 "1"   CACHE INTERNAL "Have symbol _wcsdup")
-      set(LIBC_HAS_WCSSTR                                  "1"   CACHE INTERNAL "Have symbol wcsstr")
+    set(LIBC_IS_GLIBC                                    ""    CACHE INTERNAL "Have symbol __GLIBC__")
-      set(LIBC_HAS_WCSTOL                                  "1"   CACHE INTERNAL "Have symbol wcstol")
+    set(_ALLOCA_IN_MALLOC_H                              ""    CACHE INTERNAL "Have symbol _alloca")
      set(LIBC_HAS__EXIT                                   "1"   CACHE INTERNAL "Have symbol _Exit")
      set(LIBC_HAS__I64TOA                                 "1"   CACHE INTERNAL "Have symbol _i64toa")
      set(LIBC_HAS__LTOA                                   "1"   CACHE INTERNAL "Have symbol _ltoa")
      set(LIBC_HAS__STRREV                                 "1"   CACHE INTERNAL "Have symbol _strrev")
      set(LIBC_HAS__UI64TOA                                "1"   CACHE INTERNAL "Have symbol _ui64toa")
      set(LIBC_HAS__UITOA                                  ""    CACHE INTERNAL "Have symbol _uitoa")
      set(LIBC_HAS__ULTOA                                  "1"   CACHE INTERNAL "Have symbol _ultoa")
      set(LIBC_HAS__WCSDUP                                 "1"   CACHE INTERNAL "Have symbol _wcsdup")
      set(LIBC_IS_GLIBC                                    ""    CACHE INTERNAL "Have symbol __GLIBC__")
      set(_ALLOCA_IN_MALLOC_H                              "1"   CACHE INTERNAL "Have symbol _alloca")
-      if(CHECK_CPU_ARCHITECTURE_X86)
+    if(CHECK_CPU_ARCHITECTURE_X86)
-        set(COMPILER_SUPPORTS_AVX                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX")
+      set(COMPILER_SUPPORTS_AVX                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX")
-        set(COMPILER_SUPPORTS_AVX2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX2")
+      set(COMPILER_SUPPORTS_AVX2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX2")
-        set(COMPILER_SUPPORTS_MMX                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_MMX")
+      set(COMPILER_SUPPORTS_MMX                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_MMX")
-        set(COMPILER_SUPPORTS_SSE                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE")
+      set(COMPILER_SUPPORTS_SSE                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE")
-        set(COMPILER_SUPPORTS_SSE2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE2")
+      set(COMPILER_SUPPORTS_SSE2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE2")
-        set(COMPILER_SUPPORTS_SSE3                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE3")
+      set(COMPILER_SUPPORTS_SSE3                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE3")
-        set(COMPILER_SUPPORTS_SSE4_1                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_1")
+      set(COMPILER_SUPPORTS_SSE4_1                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_1")
-        set(COMPILER_SUPPORTS_SSE4_2                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_2")
+      set(COMPILER_SUPPORTS_SSE4_2                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_2")
-      endif()
+    endif()
-      if(CHECK_CPU_ARCHITECTURE_X64)
+    if(CHECK_CPU_ARCHITECTURE_X64)
-        set(COMPILER_SUPPORTS_AVX                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX")
+      set(COMPILER_SUPPORTS_AVX                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX")
-        set(COMPILER_SUPPORTS_AVX2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX2")
+      set(COMPILER_SUPPORTS_AVX2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_AVX2")
-        set(COMPILER_SUPPORTS_MMX                            ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_MMX")
+      set(COMPILER_SUPPORTS_MMX                            ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_MMX")
-        set(COMPILER_SUPPORTS_SSE                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE")
+      set(COMPILER_SUPPORTS_SSE                            "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE")
-        set(COMPILER_SUPPORTS_SSE2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE2")
+      set(COMPILER_SUPPORTS_SSE2                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE2")
-        set(COMPILER_SUPPORTS_SSE3                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE3")
+      set(COMPILER_SUPPORTS_SSE3                           "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE3")
-        set(COMPILER_SUPPORTS_SSE4_1                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_1")
+      set(COMPILER_SUPPORTS_SSE4_1                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_1")
-        set(COMPILER_SUPPORTS_SSE4_2                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_2")
+      set(COMPILER_SUPPORTS_SSE4_2                         "1"   CACHE INTERNAL "Test COMPILER_SUPPORTS_SSE4_2")
-      endif()
+    endif()
-      if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "19.1")
+    if(CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "19.1")
-        set(HAVE_ROAPI_H                                     "1"   CACHE INTERNAL "Have include roapi.h")
+      set(HAVE_ROAPI_H                                     "1"   CACHE INTERNAL "Have include roapi.h")
-        set(HAVE_WINDOWS_GAMING_INPUT_H                      "1"   CACHE INTERNAL "Test HAVE_WINDOWS_GAMING_INPUT_H")
+      set(HAVE_WINDOWS_GAMING_INPUT_H                      "1"   CACHE INTERNAL "Test HAVE_WINDOWS_GAMING_INPUT_H")
-      else()
+    else()
-        set(HAVE_ROAPI_H                                     ""    CACHE INTERNAL "Have include roapi.h")
+      set(HAVE_ROAPI_H                                     ""    CACHE INTERNAL "Have include roapi.h")
-        set(HAVE_WINDOWS_GAMING_INPUT_H                      ""    CACHE INTERNAL "Test HAVE_WINDOWS_GAMING_INPUT_H")
+      set(HAVE_WINDOWS_GAMING_INPUT_H                      ""    CACHE INTERNAL "Test HAVE_WINDOWS_GAMING_INPUT_H")
      endif()
    endif()
  endfunction()
 endif()
--- a/cmake/PreseedNokiaNGageCache.cmake
+++ b/cmake/PreseedNokiaNGageCache.cmake
@@ -1,189 +0,0 @@
 if(NGAGESDK)
  function(SDL_Preseed_CMakeCache)
    set(COMPILER_SUPPORTS_ARMNEON                        ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_ARMNEON")
    set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR_ALWAYS      ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR_ALWAYS")
    set(COMPILER_SUPPORTS_SYNC_LOCK_TEST_AND_SET         ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_SYNC_LOCK_TEST_AND_SET")
    set(HAVE_CLANG_COMMENT_BLOCK_COMMANDS                ""    CACHE INTERNAL "Test HAVE_CLANG_COMMENT_BLOCK_COMMANDS")
    set(HAVE_ALLOCA_H                                    ""    CACHE INTERNAL "Have include alloca.h")
    set(HAVE_LIBM                                        "1"   CACHE INTERNAL "Have library m")
    set(HAVE_POSIX_SPAWN                                 ""    CACHE INTERNAL "Have symbol posix_spawn")
    set(HAVE_MALLOC                                      "1"   CACHE INTERNAL "Have include malloc.h")
    set(LIBC_HAS_ABS                                     "1"   CACHE INTERNAL "Have symbol abs")
    set(LIBC_HAS_ACOS                                    "1"   CACHE INTERNAL "Have symbol acos")
    set(LIBC_HAS_ACOSF                                   ""    CACHE INTERNAL "Have symbol acosf")
    set(LIBC_HAS_ASIN                                    "1"   CACHE INTERNAL "Have symbol asin")
    set(LIBC_HAS_ASINF                                   ""    CACHE INTERNAL "Have symbol asinf")
    set(LIBC_HAS_ATAN                                    "1"   CACHE INTERNAL "Have symbol atan")
    set(LIBC_HAS_ATAN2                                   "1"   CACHE INTERNAL "Have symbol atan2")
    set(LIBC_HAS_ATAN2F                                  ""    CACHE INTERNAL "Have symbol atan2f")
    set(LIBC_HAS_ATANF                                   ""    CACHE INTERNAL "Have symbol atanf")
    set(LIBC_HAS_ATOF                                    ""    CACHE INTERNAL "Have symbol atof")
    set(LIBC_HAS_ATOI                                    ""    CACHE INTERNAL "Have symbol atoi")
    set(LIBC_HAS_BCOPY                                   "1"   CACHE INTERNAL "Have symbol bcopy")
    set(LIBC_HAS_CALLOC                                  ""    CACHE INTERNAL "Have symbol calloc")
    set(LIBC_HAS_CEIL                                    "1"   CACHE INTERNAL "Have symbol ceil")
    set(LIBC_HAS_CEILF                                   ""    CACHE INTERNAL "Have symbol ceilf")
    set(LIBC_HAS_COPYSIGN                                "1"   CACHE INTERNAL "Have symbol copysign")
    set(LIBC_HAS_COPYSIGNF                               "1"   CACHE INTERNAL "Have symbol copysignf")
    set(LIBC_HAS_COS                                     "1"   CACHE INTERNAL "Have symbol cos")
    set(LIBC_HAS_COSF                                    ""    CACHE INTERNAL "Have symbol cosf")
    set(LIBC_HAS_EXP                                     "1"   CACHE INTERNAL "Have symbol exp")
    set(LIBC_HAS_EXPF                                    ""    CACHE INTERNAL "Have symbol expf")
    set(LIBC_HAS_FABS                                    "1"   CACHE INTERNAL "Have symbol fabs")
    set(LIBC_HAS_FABSF                                   "1"   CACHE INTERNAL "Have symbol fabsf")
    set(LIBC_HAS_FLOAT_H                                 "1"   CACHE INTERNAL "Have include float.h")
    set(LIBC_HAS_FLOOR                                   "1"   CACHE INTERNAL "Have symbol floor")
    set(LIBC_HAS_FLOORF                                  ""    CACHE INTERNAL "Have symbol floorf")
    set(LIBC_HAS_FMOD                                    ""    CACHE INTERNAL "Have symbol fmod")
    set(LIBC_HAS_FMODF                                   ""    CACHE INTERNAL "Have symbol fmodf")
    set(LIBC_HAS_FOPEN64                                 ""    CACHE INTERNAL "Have symbol fopen64")
    set(LIBC_HAS_FREE                                    "1"   CACHE INTERNAL "Have symbol free")
    set(LIBC_HAS_FSEEKO                                  ""    CACHE INTERNAL "Have symbol fseeko")
    set(LIBC_HAS_FSEEKO64                                ""    CACHE INTERNAL "Have symbol fseeko64")
    set(LIBC_HAS_GETENV                                  ""    CACHE INTERNAL "Have symbol getenv")
    set(LIBC_HAS_ICONV_H                                 ""    CACHE INTERNAL "Have include iconv.h")
    set(LIBC_HAS_INDEX                                   "1"   CACHE INTERNAL "Have symbol index")
    set(LIBC_HAS_INTTYPES_H                              "1"   CACHE INTERNAL "Have include inttypes.h")
    set(LIBC_HAS_ISINF                                   "1"   CACHE INTERNAL "Have include isinf(double)")
    set(LIBC_ISINF_HANDLES_FLOAT                         "1"   CACHE INTERNAL "Have include isinf(float)")
    set(LIBC_HAS_ISINFF                                  "1"   CACHE INTERNAL "Have include isinff(float)")
    set(LIBC_HAS_ISNAN                                   "1"   CACHE INTERNAL "Have include isnan(double)")
    set(LIBC_ISNAN_HANDLES_FLOAT                         "1"   CACHE INTERNAL "Have include isnan(float)")
    set(LIBC_HAS_ISNANF                                  "1"   CACHE INTERNAL "Have include isnanf(float)")
    set(LIBC_HAS_ITOA                                    ""    CACHE INTERNAL "Have symbol itoa")
    set(LIBC_HAS_LIMITS_H                                "1"   CACHE INTERNAL "Have include limits.h")
    set(LIBC_HAS_LOG                                     "1"   CACHE INTERNAL "Have symbol log")
    set(LIBC_HAS_LOG10                                   ""    CACHE INTERNAL "Have symbol log10")
    set(LIBC_HAS_LOG10F                                  ""    CACHE INTERNAL "Have symbol log10f")
    set(LIBC_HAS_LOGF                                    ""    CACHE INTERNAL "Have symbol logf")
    set(LIBC_HAS_LROUND                                  ""    CACHE INTERNAL "Have symbol lround")
    set(LIBC_HAS_LROUNDF                                 ""    CACHE INTERNAL "Have symbol lroundf")
    set(LIBC_HAS_MALLOC                                  "1"   CACHE INTERNAL "Have symbol malloc")
    set(LIBC_HAS_MALLOC_H                                ""    CACHE INTERNAL "Have include malloc.h")
    set(LIBC_HAS_MATH_H                                  "1"   CACHE INTERNAL "Have include math.h")
    set(LIBC_HAS_MEMCMP                                  "1"   CACHE INTERNAL "Have symbol memcmp")
    set(LIBC_HAS_MEMCPY                                  ""    CACHE INTERNAL "Have symbol memcpy")
    set(LIBC_HAS_MEMMOVE                                 ""    CACHE INTERNAL "Have symbol memmove")
    set(LIBC_HAS_MEMORY_H                                ""    CACHE INTERNAL "Have include memory.h")
    set(LIBC_HAS_MEMSET                                  ""    CACHE INTERNAL "Have symbol memset")
    set(LIBC_HAS_MODF                                    "1"   CACHE INTERNAL "Have symbol modf")
    set(LIBC_HAS_MODFF                                   ""    CACHE INTERNAL "Have symbol modff")
    set(LIBC_HAS_POW                                     "1"   CACHE INTERNAL "Have symbol pow")
    set(LIBC_HAS_POWF                                    ""    CACHE INTERNAL "Have symbol powf")
    set(LIBC_HAS_PUTENV                                  ""    CACHE INTERNAL "Have symbol putenv")
    set(LIBC_HAS_REALLOC                                 ""    CACHE INTERNAL "Have symbol realloc")
    set(LIBC_HAS_RINDEX                                  "1"   CACHE INTERNAL "Have symbol rindex")
    set(LIBC_HAS_ROUND                                   ""    CACHE INTERNAL "Have symbol round")
    set(LIBC_HAS_ROUNDF                                  ""    CACHE INTERNAL "Have symbol roundf")
    set(LIBC_HAS_SCALBN                                  "1"   CACHE INTERNAL "Have symbol scalbn")
    set(LIBC_HAS_SCALBNF                                 ""    CACHE INTERNAL "Have symbol scalbnf")
    set(LIBC_HAS_SETENV                                  ""    CACHE INTERNAL "Have symbol setenv")
    set(LIBC_HAS_SIGNAL_H                                ""    CACHE INTERNAL "Have include signal.h")
    set(LIBC_HAS_SIN                                     "1"   CACHE INTERNAL "Have symbol sin")
    set(LIBC_HAS_SINF                                    ""    CACHE INTERNAL "Have symbol sinf")
    set(LIBC_HAS_SQR                                     ""    CACHE INTERNAL "Have symbol sqr")
    set(LIBC_HAS_SQRT                                    "1"   CACHE INTERNAL "Have symbol sqrt")
    set(LIBC_HAS_SQRTF                                   ""    CACHE INTERNAL "Have symbol sqrtf")
    set(LIBC_HAS_SSCANF                                  "1"   CACHE INTERNAL "Have symbol sscanf")
    set(LIBC_HAS_STDARG_H                                "1"   CACHE INTERNAL "Have include stdarg.h")
    set(LIBC_HAS_STDBOOL_H                               "1"   CACHE INTERNAL "Have include stdbool.h")
    set(LIBC_HAS_STDDEF_H                                "1"   CACHE INTERNAL "Have include stddef.h")
    set(LIBC_HAS_STDINT_H                                "1"   CACHE INTERNAL "Have include stdint.h")
    set(LIBC_HAS_STDIO_H                                 "1"   CACHE INTERNAL "Have include stdio.h")
    set(LIBC_HAS_STDLIB_H                                "1"   CACHE INTERNAL "Have include stdlib.h")
    set(LIBC_HAS_STRCASESTR                              ""    CACHE INTERNAL "Have symbol strcasestr")
    set(LIBC_HAS_STRCHR                                  "1"   CACHE INTERNAL "Have symbol strchr")
    set(LIBC_HAS_STRCMP                                  "1"   CACHE INTERNAL "Have symbol strcmp")
    set(LIBC_HAS_STRINGS_H                               ""    CACHE INTERNAL "Have include strings.h")
    set(LIBC_HAS_STRING_H                                "1"   CACHE INTERNAL "Have include string.h")
    set(LIBC_HAS_STRLCAT                                 ""    CACHE INTERNAL "Have symbol strlcat")
    set(LIBC_HAS_STRLCPY                                 ""    CACHE INTERNAL "Have symbol strlcpy")
    set(LIBC_HAS_STRLEN                                  "1"   CACHE INTERNAL "Have symbol strlen")
    set(LIBC_HAS_STRNCMP                                 "1"   CACHE INTERNAL "Have symbol strncmp")
    set(LIBC_HAS_STRNLEN                                 ""    CACHE INTERNAL "Have symbol strnlen")
    set(LIBC_HAS_STRNSTR                                 ""    CACHE INTERNAL "Have symbol strnstr")
    set(LIBC_HAS_STRPBRK                                 "1"   CACHE INTERNAL "Have symbol strpbrk")
    set(LIBC_HAS_STRRCHR                                 "1"   CACHE INTERNAL "Have symbol strrchr")
    set(LIBC_HAS_STRSTR                                  "1"   CACHE INTERNAL "Have symbol strstr")
    set(LIBC_HAS_STRTOD                                  ""    CACHE INTERNAL "Have symbol strtod")
    set(LIBC_HAS_STRTOK_R                                ""    CACHE INTERNAL "Have symbol strtok_r")
    set(LIBC_HAS_STRTOL                                  ""    CACHE INTERNAL "Have symbol strtol")
    set(LIBC_HAS_STRTOLL                                 ""    CACHE INTERNAL "Have symbol strtoll")
    set(LIBC_HAS_STRTOUL                                 ""    CACHE INTERNAL "Have symbol strtoul")
    set(LIBC_HAS_STRTOULL                                ""    CACHE INTERNAL "Have symbol strtoull")
    set(LIBC_HAS_SYS_TYPES_H                             "1"   CACHE INTERNAL "Have include sys/types.h")
    set(LIBC_HAS_TAN                                     "1"   CACHE INTERNAL "Have symbol tan")
    set(LIBC_HAS_TANF                                    ""    CACHE INTERNAL "Have symbol tanf")
    set(LIBC_HAS_TIME_H                                  "1"   CACHE INTERNAL "Have include time.h")
    set(LIBC_HAS_TRUNC                                   ""    CACHE INTERNAL "Have symbol trunc")
    set(LIBC_HAS_TRUNCF                                  ""    CACHE INTERNAL "Have symbol truncf")
    set(LIBC_HAS_UNSETENV                                ""    CACHE INTERNAL "Have symbol unsetenv")
    set(LIBC_HAS_VSNPRINTF                               ""    CACHE INTERNAL "Have symbol vsnprintf")
    set(LIBC_HAS_VSSCANF                                 ""    CACHE INTERNAL "Have symbol vsscanf")
    set(LIBC_HAS_WCHAR_H                                 "1"   CACHE INTERNAL "Have include wchar.h")
    set(LIBC_HAS_WCSCMP                                  ""    CACHE INTERNAL "Have symbol wcscmp")
    set(LIBC_HAS_WCSDUP                                  ""    CACHE INTERNAL "Have symbol wcsdup")
    set(LIBC_HAS_WCSLCAT                                 ""    CACHE INTERNAL "Have symbol wcslcat")
    set(LIBC_HAS_WCSLCPY                                 ""    CACHE INTERNAL "Have symbol wcslcpy")
    set(LIBC_HAS_WCSLEN                                  ""    CACHE INTERNAL "Have symbol wcslen")
    set(LIBC_HAS_WCSNCMP                                 ""    CACHE INTERNAL "Have symbol wcsncmp")
    set(LIBC_HAS_WCSNLEN                                 ""    CACHE INTERNAL "Have symbol wcsnlen")
    set(LIBC_HAS_WCSSTR                                  ""    CACHE INTERNAL "Have symbol wcsstr")
    set(LIBC_HAS_WCSTOL                                  ""    CACHE INTERNAL "Have symbol wcstol")
    set(LIBC_HAS__EXIT                                   ""    CACHE INTERNAL "Have symbol _Exit")
    set(LIBC_HAS__I64TOA                                 ""    CACHE INTERNAL "Have symbol _i64toa")
    set(LIBC_HAS__LTOA                                   ""    CACHE INTERNAL "Have symbol _ltoa")
    set(LIBC_HAS__STRREV                                 ""    CACHE INTERNAL "Have symbol _strrev")
    set(LIBC_HAS__UI64TOA                                ""    CACHE INTERNAL "Have symbol _ui64toa")
    set(LIBC_HAS__UITOA                                  ""    CACHE INTERNAL "Have symbol _uitoa")
    set(LIBC_HAS__ULTOA                                  ""    CACHE INTERNAL "Have symbol _ultoa")
    set(LIBC_HAS__WCSDUP                                 ""    CACHE INTERNAL "Have symbol _wcsdup")
    set(LIBC_IS_GLIBC                                    ""    CACHE INTERNAL "Have symbol __GLIBC__")
    set(_ALLOCA_IN_MALLOC_H                              ""    CACHE INTERNAL "Have symbol _alloca")
    set(HAVE_GCC_WALL                                    "1"   CACHE INTERNAL "Test HAVE_GCC_WALL")
    set(HAVE_GCC_WUNDEF                                  "1"   CACHE INTERNAL "Test HAVE_GCC_WUNDEF")
    set(HAVE_GCC_WFLOAT_CONVERSION                       ""    CACHE INTERNAL "Test HAVE_GCC_WFLOAT_CONVERSION")
    set(HAVE_GCC_NO_STRICT_ALIASING                      "1"   CACHE INTERNAL "Test HAVE_GCC_NO_STRICT_ALIASING")
    set(HAVE_GCC_WDOCUMENTATION                          ""    CACHE INTERNAL "Test HAVE_GCC_WDOCUMENTATION")
    set(HAVE_GCC_WDOCUMENTATION_UNKNOWN_COMMAND          ""    CACHE INTERNAL "Test HAVE_GCC_WDOCUMENTATION_UNKNOWN_COMMAND")
    set(HAVE_GCC_COMMENT_BLOCK_COMMANDS                  ""    CACHE INTERNAL "Test HAVE_GCC_COMMENT_BLOCK_COMMANDS")
    set(HAVE_GCC_WSHADOW                                 "1"   CACHE INTERNAL "Test HAVE_GCC_WSHADOW")
    set(HAVE_GCC_WUNUSED_LOCAL_TYPEDEFS                  ""    CACHE INTERNAL "Test HAVE_GCC_WUNUSED_LOCAL_TYPEDEFS")
    set(HAVE_GCC_WIMPLICIT_FALLTHROUGH                   ""    CACHE INTERNAL "Test HAVE_GCC_WIMPLICIT_FALLTHROUGH")
    set(HAVE_GCC_FVISIBILITY                             ""    CACHE INTERNAL "Test HAVE_GCC_FVISIBILITY")
    set(HAVE_ST_MTIM                                     ""    CACHE INTERNAL "Test HAVE_ST_MTIM")
    #set(HAVE_O_CLOEXEC                                   ""    CACHE INTERNAL "Test HAVE_O_CLOEXEC")
    #set(COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR             ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_FDIAGNOSTICS_COLOR")
    set(COMPILER_SUPPORTS_GCC_ATOMICS                    ""    CACHE INTERNAL "Test COMPILER_SUPPORTS_GCC_ATOMICS")
    set(HAVE_WL_VERSION_SCRIPT                           ""    CACHE INTERNAL "Test HAVE_WL_VERSION_SCRIPT")
    set(LINKER_SUPPORTS_WL_NO_UNDEFINED                  ""    CACHE INTERNAL "Test LINKER_SUPPORTS_WL_NO_UNDEFINED")
    set(ICONV_IN_LIBC                                    ""    CACHE INTERNAL "Test ICONV_IN_LIBC")
    set(ICONV_IN_LIBICONV                                ""    CACHE INTERNAL "Test ICONV_IN_LIBICONV")
    #set(LIBC_HAS_WORKING_LIBUNWIND                       ""    CACHE INTERNAL "Test LIBC_HAS_WORKING_LIBUNWIND")
    #set(LIBUNWIND_HAS_WORKINGLIBUNWIND                   ""    CACHE INTERNAL "Test LIBUNWIND_HAS_WORKINGLIBUNWIND")
    set(HAVE_GETPAGESIZE                                 ""    CACHE INTERNAL "Have symbol getpagesize")
    set(HAVE_SIGACTION                                   ""    CACHE INTERNAL "Have symbol sigaction")
    set(HAVE_SA_SIGACTION                                ""    CACHE INTERNAL "Have symbol sa_sigaction")
    set(HAVE_SETJMP                                      ""    CACHE INTERNAL "Have symbol setjmp")
    set(HAVE_NANOSLEEP                                   ""    CACHE INTERNAL "Have symbol nanosleep")
    set(HAVE_GMTIME_R                                    ""    CACHE INTERNAL "Have symbol gmtime_r")
    set(HAVE_LOCALTIME_R                                 ""    CACHE INTERNAL "Have symbol localtime_r")
    set(HAVE_NL_LANGINFO                                 ""    CACHE INTERNAL "Have symbol nl_langinfo")
    set(HAVE_SYSCONF                                     ""    CACHE INTERNAL "Have symbol sysconf")
    set(HAVE_SYSCTLBYNAME                                ""    CACHE INTERNAL "Have symbol sysctlbyname")
    set(HAVE_GETAUXVAL                                   ""    CACHE INTERNAL "Have symbol getauxval")
    set(HAVE_ELF_AUX_INFO                                ""    CACHE INTERNAL "Have symbol elf_aux_info")
    set(HAVE_POLL                                        ""    CACHE INTERNAL "Have symbol poll")
    set(HAVE_MEMFD_CREATE                                ""    CACHE INTERNAL "Have symbol memfd_create")
    set(HAVE_POSIX_FALLOCATE                             ""    CACHE INTERNAL "Have symbol posix_fallocate")
    set(HAVE_DLOPEN_IN_LIBC                              ""    CACHE INTERNAL "Have symbol dlopen")
    set(HAVE_GETHOSTNAME                                 ""    CACHE INTERNAL "Have symbol gethostname")
    set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR           ""    CACHE INTERNAL "Have symbol addchdir")
    set(HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR_NP        ""    CACHE INTERNAL "Have symbol addchdir_np")
    set(HAVE_FDATASYNC                                   ""    CACHE INTERNAL "Have symbol fdatasync")
    set(HAVE_SDL_FSOPS                                   "1"   CACHE INTERNAL "Enable SDL_FSOPS")
    set(HAVE_SDL_LOCALE                                  "1"   CACHE INTERNAL "Enable SDL_LOCALE")
  endfunction()
 endif()
--- a/cmake/SDL3Config.cmake.in
+++ b/cmake/SDL3Config.cmake.in
@@ -34,7 +34,7 @@ endmacro()
 if(_sdl3_framework)
  set(SDL3_SDL3-static_FOUND TRUE)
  find_sdl3_static_dependencies()
-  find_package(SDL3-static CONFIG QUIET)
+  find_package(SDL3-static CONFIG)
  if(SDL3_SDL3-static_FOUND AND SDL3-static_FOUND)
    set(SDL3_SDL3-static_FOUND TRUE)
  endif()
@@ -62,7 +62,7 @@ endif()
 # Find SDL3::SDL3_test
 if(_sdl3_framework)
-  find_package(SDL3_test CONFIG QUIET)
+  find_package(SDL3_test CONFIG)
  if(SDL3_test_FOUND)
    enable_language(OBJC)
    set(SDL3_SDL3_test_FOUND TRUE)
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@@ -296,15 +296,15 @@ endfunction()
 function(check_linker_supports_version_file VAR)
  SDL_detect_linker()
  if(CMAKE_C_COMPILER_LINKER_ID MATCHES "^(MSVC)$")
-    set(${VAR} FALSE)
+    set(LINKER_SUPPORTS_VERSION_SCRIPT FALSE)
  else()
    cmake_push_check_state(RESET)
    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/dummy.sym" "n_0 {\n global:\n  func;\n local: *;\n};\n")
    list(APPEND CMAKE_REQUIRED_LINK_OPTIONS "-Wl,--version-script=${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/dummy.sym")
-    check_c_source_compiles("int func(void) {return 0;} int main(int argc,char*argv[]){(void)argc;(void)argv;return func();}" ${VAR} FAIL_REGEX "(unsupported|syntax error|unrecognized option)")
+    check_c_source_compiles("int func(void) {return 0;} int main(int argc,char*argv[]){(void)argc;(void)argv;return func();}" LINKER_SUPPORTS_VERSION_SCRIPT FAIL_REGEX "(unsupported|syntax error|unrecognized option)")
    cmake_pop_check_state()
  endif()
-  set(${VAR} "${${VAR}}" PARENT_SCOPE)
+  set(${VAR} "${LINKER_SUPPORTS_VERSION_SCRIPT}" PARENT_SCOPE)
 endfunction()
 if(CMAKE_VERSION VERSION_LESS 3.18)
@@ -334,29 +334,6 @@ if(APPLE)
  endif()
 endif()
 function(PrintEnabledBackends _SUBSYS _REGEXP)
  get_cmake_property(_ALLVARS VARIABLES)
  foreach(_VAR IN LISTS _ALLVARS)
    if(_VAR AND _VAR MATCHES "${_REGEXP}")
      string(TOLOWER "${CMAKE_MATCH_1}" _LOWERED)
      if(NOT _LOWERED MATCHES "available|default|dynamic")  # a little hack
        if(${_VAR}_DYNAMIC)
          list(APPEND _ENABLED_BACKENDS "${_LOWERED}(dynamic)")
        else()
          list(APPEND _ENABLED_BACKENDS "${_LOWERED}")
        endif()
      endif()
    endif()
  endforeach()
  if(_ENABLED_BACKENDS STREQUAL "")
    set(_SPACEDOUT "(none)")
  else()
    string(REPLACE ";" " " _SPACEDOUT "${_ENABLED_BACKENDS}")
  endif()
  message(STATUS "  ${_SUBSYS}: ${_SPACEDOUT}")
 endfunction()
 function(SDL_PrintSummary)
  ##### Info output #####
  message(STATUS "")
@@ -385,23 +362,13 @@ function(SDL_PrintSummary)
  message(STATUS "")
  message(STATUS " Build Shared Library: ${SDL_SHARED}")
  message(STATUS " Build Static Library: ${SDL_STATIC}")
  if(SDL_STATIC)
    message(STATUS " Build Static Library with Position Independent Code: ${SDL_STATIC_PIC}")
  endif()
  if(APPLE)
    message(STATUS " Build libraries as Apple Framework: ${SDL_FRAMEWORK}")
  endif()
  message(STATUS "")
  message(STATUS "Enabled backends:")
  PrintEnabledBackends("Video drivers" "^SDL_VIDEO_DRIVER_([A-Z0-9]*)$")
  if(SDL_VIDEO_DRIVER_X11)
    PrintEnabledBackends("X11 libraries" "^SDL_VIDEO_DRIVER_X11_([A-Z0-9]*)$")
  endif()
  PrintEnabledBackends("Render drivers" "^SDL_VIDEO_RENDER_([A-Z0-9_]*)$")
  PrintEnabledBackends("GPU drivers" "^SDL_GPU_([A-Z0-9]*)$")
  PrintEnabledBackends("Audio drivers" "^SDL_AUDIO_DRIVER_([A-Z0-9]*)$")
  PrintEnabledBackends("Joystick drivers" "^SDL_JOYSTICK_([A-Z0-9]*)$")
  PrintEnabledBackends("Camera drivers" "^SDL_CAMERA_DRIVER_([A-Z0-9]*)$")
  message(STATUS "")
  if(UNIX)
    message(STATUS "If something was not detected, although the libraries")
    message(STATUS "were installed, then make sure you have set the")
@@ -418,7 +385,7 @@ function(SDL_PrintSummary)
          "Most likely, this is not wanted."
          "\n"
          "On Linux, install the packages listed at "
-          "https://wiki.libsdl.org/SDL3/README-linux#build-dependencies "
+          "https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies "
          "\n"
          "If you really don't need desktop windows, the documentation tells you how to skip this check. "
          "https://github.com/libsdl-org/SDL/blob/main/docs/README-cmake.md#cmake-fails-to-build-without-x11-or-wayland-support\n"
@@ -428,22 +395,6 @@ function(SDL_PrintSummary)
  endif()
 endfunction()
 function(SDL_missing_dependency NAME OPTION)
  if(LINUX)
    message( FATAL_ERROR
      "Couldn't find dependency package for ${NAME}. Please install the needed packages or configure with -D${OPTION}=OFF"
      "\n"
      "The full set of dependencies is available at "
      "https://wiki.libsdl.org/SDL3/README-linux#build-dependencies "
      "\n"
    )
  else()
    message( FATAL_ERROR
      "Couldn't find dependency package for ${NAME}. Please install the needed packages or configure with -D${OPTION}=OFF"
    )
  endif()
 endfunction()
 function(SDL_install_pdb TARGET DIRECTORY)
  get_property(type TARGET ${TARGET} PROPERTY TYPE)
  if(type MATCHES "^(SHARED_LIBRARY|EXECUTABLE)$")
--- a/cmake/sdlchecks.cmake
+++ b/cmake/sdlchecks.cmake
@@ -1,10 +1,3 @@
 macro(check_c_source_compiles_static SOURCE VAR)
  set(saved_CMAKE_TRY_COMPILE_TARGET_TYPE "${CMAKE_TRY_COMPILE_TARGET_TYPE}")
  set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
  check_c_source_compiles("${SOURCE}" ${VAR} ${ARGN})
  set(CMAKE_TRY_COMPILE_TARGET_TYPE "${saved_CMAKE_TRY_COMPILE_TARGET_TYPE}")
 endmacro()
 macro(FindLibraryAndSONAME _LIB)
  cmake_parse_arguments(_FLAS "" "" "LIBDIRS" ${ARGN})
@@ -281,11 +274,10 @@ macro(CheckX11)
    set(Xrandr_PKG_CONFIG_SPEC xrandr)
    set(Xrender_PKG_CONFIG_SPEC xrender)
    set(Xss_PKG_CONFIG_SPEC xscrnsaver)
    set(Xtst_PKG_CONFIG_SPEC xtst)
    find_package(X11)
-    foreach(_LIB X11 Xext Xcursor Xi Xfixes Xrandr Xrender Xss Xtst)
+    foreach(_LIB X11 Xext Xcursor Xi Xfixes Xrandr Xrender Xss)
      get_filename_component(_libdir "${X11_${_LIB}_LIB}" DIRECTORY)
      FindLibraryAndSONAME("${_LIB}" LIBDIRS ${_libdir})
    endforeach()
@@ -318,7 +310,6 @@ macro(CheckX11)
    find_file(HAVE_XSYNC_H NAMES "X11/extensions/sync.h" HINTS "${X11_INCLUDEDIR}")
    find_file(HAVE_XSS_H NAMES "X11/extensions/scrnsaver.h" HINTS "${X11_INCLUDEDIR}")
    find_file(HAVE_XSHAPE_H NAMES "X11/extensions/shape.h" HINTS "${X11_INCLUDEDIR}")
    find_file(HAVE_XTEST_H NAMES "X11/extensions/XTest.h" HINTS "${X11_INCLUDEDIR}")
    find_file(HAVE_XDBE_H NAMES "X11/extensions/Xdbe.h" HINTS "${X11_INCLUDEDIR}")
    find_file(HAVE_XEXT_H NAMES "X11/extensions/Xext.h" HINTS "${X11_INCLUDEDIR}")
@@ -376,7 +367,7 @@ macro(CheckX11)
      list(APPEND CMAKE_REQUIRED_LIBRARIES ${X11_LIB})
-      check_c_source_compiles_static("
+      check_c_source_compiles("
          #include <X11/Xlib.h>
          int main(int argc, char **argv) {
            Display *display;
@@ -390,90 +381,51 @@ macro(CheckX11)
        set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1)
      endif()
-      check_include_file("X11/XKBlib.h" SDL_VIDEO_DRIVER_X11_HAS_XKBLIB)
+      check_symbol_exists(XkbLookupKeySym "X11/Xlib.h;X11/XKBlib.h" SDL_VIDEO_DRIVER_X11_HAS_XKBLOOKUPKEYSYM)
-      if(SDL_X11_XCURSOR)
+      if(SDL_X11_XCURSOR AND HAVE_XCURSOR_H AND XCURSOR_LIB)
-        if (HAVE_XCURSOR_H AND XCURSOR_LIB)
+        set(HAVE_X11_XCURSOR TRUE)
-          set(HAVE_X11_XCURSOR TRUE)
+        if(HAVE_X11_SHARED)
-          if(HAVE_X11_SHARED)
+          set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "\"${XCURSOR_LIB_SONAME}\"")
            set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "\"${XCURSOR_LIB_SONAME}\"")
          else()
            sdl_link_dependency(xcursor LIBS X11::Xcursor CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xcursor_PKG_CONFIG_SPEC})
          endif()
          set(SDL_VIDEO_DRIVER_X11_XCURSOR 1)
        else()
-          SDL_missing_dependency(XCURSOR SDL_X11_XCURSOR)
+          sdl_link_dependency(xcursor LIBS X11::Xcursor CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xcursor_PKG_CONFIG_SPEC})
        endif()
        set(SDL_VIDEO_DRIVER_X11_XCURSOR 1)
      endif()
-      if(SDL_X11_XDBE)
+      if(SDL_X11_XDBE AND HAVE_XDBE_H)
-        if(HAVE_XDBE_H)
+        set(HAVE_X11_XDBE TRUE)
-          set(HAVE_X11_XDBE TRUE)
+        set(SDL_VIDEO_DRIVER_X11_XDBE 1)
          set(SDL_VIDEO_DRIVER_X11_XDBE 1)
        else()
          SDL_missing_dependency(XDBE SDL_X11_XDBE)
        endif()
      endif()
-      if(SDL_X11_XINPUT)
+      if(SDL_X11_XINPUT AND HAVE_XINPUT2_H AND XI_LIB)
-        if(HAVE_XINPUT2_H AND XI_LIB)
+        set(HAVE_X11_XINPUT TRUE)
-          set(HAVE_X11_XINPUT TRUE)
+        if(HAVE_X11_SHARED)
-          if(HAVE_X11_SHARED)
+          set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "\"${XI_LIB_SONAME}\"")
            set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "\"${XI_LIB_SONAME}\"")
          else()
            sdl_link_dependency(xi LIBS X11::Xi CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xi_PKG_CONFIG_SPEC})
          endif()
          set(SDL_VIDEO_DRIVER_X11_XINPUT2 1)
          # Check for scroll info
          check_c_source_compiles("
              #include <X11/Xlib.h>
              #include <X11/Xproto.h>
              #include <X11/extensions/XInput2.h>
              XIScrollClassInfo *s;
              int main(int argc, char **argv) {}" HAVE_XINPUT2_SCROLLINFO)
          if(HAVE_XINPUT2_SCROLLINFO)
            set(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_SCROLLINFO 1)
          endif()
          # Check for multitouch
          check_c_source_compiles_static("
              #include <X11/Xlib.h>
              #include <X11/Xproto.h>
              #include <X11/extensions/XInput2.h>
              int event_type = XI_TouchBegin;
              XITouchClassInfo *t;
              Status XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f) {
                return (Status)0;
              }
              int main(int argc, char **argv) { return 0; }" HAVE_XINPUT2_MULTITOUCH)
          if(HAVE_XINPUT2_MULTITOUCH)
            set(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1)
          endif()
          # Check for gesture
          check_c_source_compiles("
              #include <X11/Xlib.h>
              #include <X11/Xproto.h>
              #include <X11/extensions/XInput2.h>
              int event_type = XI_GesturePinchBegin;
              XITouchClassInfo *t;
              Status XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f) {
                return (Status)0;
              }
              int main(int argc, char **argv) { return 0; }" HAVE_XINPUT2_GESTURE)
          if(HAVE_XINPUT2_GESTURE)
            set(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_GESTURE 1)
          endif()
        else()
-          SDL_missing_dependency(XINPUT SDL_X11_XINPUT)
+          sdl_link_dependency(xi LIBS X11::Xi CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xi_PKG_CONFIG_SPEC})
        endif()
        set(SDL_VIDEO_DRIVER_X11_XINPUT2 1)
        # Check for multitouch
        check_c_source_compiles("
            #include <X11/Xlib.h>
            #include <X11/Xproto.h>
            #include <X11/extensions/XInput2.h>
            int event_type = XI_TouchBegin;
            XITouchClassInfo *t;
            Status XIAllowTouchEvents(Display *a,int b,unsigned int c,Window d,int f) {
              return (Status)0;
            }
            int main(int argc, char **argv) { return 0; }" HAVE_XINPUT2_MULTITOUCH)
        if(HAVE_XINPUT2_MULTITOUCH)
          set(SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1)
        endif()
      endif()
      # check along with XInput2.h because we use Xfixes with XIBarrierReleasePointer
      if(SDL_X11_XFIXES AND HAVE_XFIXES_H_ AND HAVE_XINPUT2_H)
-        check_c_source_compiles_static("
+        check_c_source_compiles("
            #include <X11/Xlib.h>
            #include <X11/Xproto.h>
            #include <X11/extensions/XInput2.h>
@@ -481,78 +433,44 @@ macro(CheckX11)
            BarrierEventID b;
            int main(int argc, char **argv) { return 0; }" HAVE_XFIXES_H)
      endif()
-      if(SDL_X11_XFIXES)
+      if(SDL_X11_XFIXES AND HAVE_XFIXES_H AND HAVE_XINPUT2_H AND XFIXES_LIB)
-        if (HAVE_XFIXES_H AND HAVE_XINPUT2_H AND XFIXES_LIB)
+        if(HAVE_X11_SHARED)
-          if(HAVE_X11_SHARED)
+          set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XFIXES "\"${XFIXES_LIB_SONAME}\"")
            set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XFIXES "\"${XFIXES_LIB_SONAME}\"")
          else()
            sdl_link_dependency(xfixes LIBS X11::Xfixes CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xfixes_PKG_CONFIG_SPEC})
          endif()
          set(SDL_VIDEO_DRIVER_X11_XFIXES 1)
          set(HAVE_X11_XFIXES TRUE)
        else()
-          SDL_missing_dependency(XFIXES SDL_X11_XFIXES)
+          sdl_link_dependency(xfixes LIBS X11::Xfixes CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xfixes_PKG_CONFIG_SPEC})
        endif()
        set(SDL_VIDEO_DRIVER_X11_XFIXES 1)
        set(HAVE_X11_XFIXES TRUE)
      endif()
-      if(SDL_X11_XSYNC)
+      if(SDL_X11_XSYNC AND HAVE_XSYNC_H AND XEXT_LIB)
-        if(HAVE_XSYNC_H AND XEXT_LIB)
+        set(SDL_VIDEO_DRIVER_X11_XSYNC 1)
-          set(SDL_VIDEO_DRIVER_X11_XSYNC 1)
+        set(HAVE_X11_XSYNC TRUE)
          set(HAVE_X11_XSYNC TRUE)
        else()
          SDL_missing_dependency(XSYNC SDL_X11_XSYNC)
        endif()
      endif()
-      if(SDL_X11_XRANDR)
+      if(SDL_X11_XRANDR AND HAVE_XRANDR_H AND XRANDR_LIB)
-        if(HAVE_XRANDR_H AND XRANDR_LIB)
+        if(HAVE_X11_SHARED)
-          if(HAVE_X11_SHARED)
+          set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "\"${XRANDR_LIB_SONAME}\"")
            set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "\"${XRANDR_LIB_SONAME}\"")
          else()
            sdl_link_dependency(xrandr LIBS X11::Xrandr CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xrandr_PKG_CONFIG_SPEC})
          endif()
          set(SDL_VIDEO_DRIVER_X11_XRANDR 1)
          set(HAVE_X11_XRANDR TRUE)
        else()
-          SDL_missing_dependency(XRANDR SDL_X11_XRANDR)
+          sdl_link_dependency(xrandr LIBS X11::Xrandr CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xrandr_PKG_CONFIG_SPEC})
        endif()
        set(SDL_VIDEO_DRIVER_X11_XRANDR 1)
        set(HAVE_X11_XRANDR TRUE)
      endif()
-      if(SDL_X11_XSCRNSAVER)
+      if(SDL_X11_XSCRNSAVER AND HAVE_XSS_H AND XSS_LIB)
-        if(HAVE_XSS_H AND XSS_LIB)
+        if(HAVE_X11_SHARED)
-          if(HAVE_X11_SHARED)
+          set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "\"${XSS_LIB_SONAME}\"")
            set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "\"${XSS_LIB_SONAME}\"")
          else()
            sdl_link_dependency(xss LIBS X11::Xss CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xss_PKG_CONFIG_SPEC})
          endif()
          set(SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1)
          set(HAVE_X11_XSCRNSAVER TRUE)
        else()
-          SDL_missing_dependency(XSCRNSAVER SDL_X11_XSCRNSAVER)
+          sdl_link_dependency(xss LIBS X11::Xss CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xss_PKG_CONFIG_SPEC})
        endif()
        set(SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1)
        set(HAVE_X11_XSCRNSAVER TRUE)
      endif()
-      if(SDL_X11_XSHAPE)
+      if(SDL_X11_XSHAPE AND HAVE_XSHAPE_H)
-        if(HAVE_XSHAPE_H)
+        set(SDL_VIDEO_DRIVER_X11_XSHAPE 1)
-          set(SDL_VIDEO_DRIVER_X11_XSHAPE 1)
+        set(HAVE_X11_XSHAPE TRUE)
          set(HAVE_X11_XSHAPE TRUE)
        else()
          SDL_missing_dependency(XSHAPE SDL_X11_XSHAPE)
        endif()
      endif()
      if(SDL_X11_XTEST)
        if(HAVE_XTEST_H AND XTST_LIB)
          if(HAVE_X11_SHARED)
            set(SDL_VIDEO_DRIVER_X11_DYNAMIC_XTEST "\"${XTST_LIB_SONAME}\"")
          else()
            sdl_link_dependency(xtst LIBS X11::Xtst CMAKE_MODULE X11 PKG_CONFIG_SPECS ${Xtst_PKG_CONFIG_SPEC})
          endif()
          set(SDL_VIDEO_DRIVER_X11_XTEST 1)
          set(HAVE_X11_XTEST TRUE)
        else()
          SDL_missing_dependency(XTEST SDL_X11_XTEST)
        endif()
      endif()
    endif()
  endif()
@@ -563,56 +481,6 @@ macro(CheckX11)
  cmake_pop_check_state()
 endmacro()
 macro(CheckFribidi)
  if(SDL_FRIBIDI)
    set(FRIBIDI_PKG_CONFIG_SPEC fribidi)
    set(PC_FRIBIDI_FOUND FALSE)
    if(PKG_CONFIG_FOUND)
      pkg_check_modules(PC_FRIBIDI IMPORTED_TARGET ${FRIBIDI_PKG_CONFIG_SPEC})
    endif()
    if(PC_FRIBIDI_FOUND)
      set(HAVE_FRIBIDI TRUE)
      set(HAVE_FRIBIDI_H 1)
      if(SDL_FRIBIDI_SHARED AND NOT HAVE_SDL_LOADSO)
        message(WARNING "You must have SDL_LoadObject() support for dynamic fribidi loading")
      endif()
      FindLibraryAndSONAME("fribidi" LIBDIRS ${PC_FRIBIDI_LIBRARY_DIRS})
      if(SDL_FRIBIDI_SHARED AND FRIBIDI_LIB AND HAVE_SDL_LOADSO)
        set(SDL_FRIBIDI_DYNAMIC "\"${FRIBIDI_LIB_SONAME}\"")
        set(HAVE_FRIBIDI_SHARED TRUE)
        sdl_include_directories(PRIVATE SYSTEM $<TARGET_PROPERTY:PkgConfig::PC_FRIBIDI,INTERFACE_INCLUDE_DIRECTORIES>)
      else()
        sdl_link_dependency(fribidi LIBS PkgConfig::PC_FRIBIDI PKG_CONFIG_PREFIX PC_FRIBIDI PKG_CONFIG_SPECS ${FRIBIDI_PKG_CONFIG_SPEC})
      endif()
    endif()
  endif()
 endmacro()
 macro(CheckLibThai)
  if(SDL_LIBTHAI)
    set(LIBTHAI_PKG_CONFIG_SPEC libthai)
    set(PC_LIBTHAI_FOUND FALSE)
    if(PKG_CONFIG_FOUND)
      pkg_check_modules(PC_LIBTHAI IMPORTED_TARGET ${LIBTHAI_PKG_CONFIG_SPEC})
    endif()
    if(PC_LIBTHAI_FOUND)
      set(HAVE_LIBTHAI TRUE)
      set(HAVE_LIBTHAI_H 1)
      if(SDL_LIBTHAI_SHARED AND NOT HAVE_SDL_LOADSO)
        message(WARNING "You must have SDL_LoadObject() support for dynamic libthai loading")
      endif()
      FindLibraryAndSONAME("thai" LIBDIRS ${PC_LIBTHAI_LIBRARY_DIRS})
      if(SDL_LIBTHAI_SHARED AND THAI_LIB AND HAVE_SDL_LOADSO)
        set(SDL_LIBTHAI_DYNAMIC "\"${THAI_LIB_SONAME}\"")
        set(HAVE_LIBTHAI_SHARED TRUE)
        sdl_include_directories(PRIVATE SYSTEM $<TARGET_PROPERTY:PkgConfig::PC_LIBTHAI,INTERFACE_INCLUDE_DIRECTORIES>)
      else()
        sdl_link_dependency(libthai LIBS PkgConfig::PC_LIBTHAI PKG_CONFIG_PREFIX PC_LIBTHAI PKG_CONFIG_SPECS ${LIBTHAI_PKG_CONFIG_SPEC})
      endif()
    endif()
  endif()
 endmacro()
 macro(WaylandProtocolGen _SCANNER _CODE_MODE _XML _PROTL)
    set(_WAYLAND_PROT_C_CODE "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols/${_PROTL}-protocol.c")
    set(_WAYLAND_PROT_H_CODE "${CMAKE_CURRENT_BINARY_DIR}/wayland-generated-protocols/${_PROTL}-client-protocol.h")
@@ -707,18 +575,6 @@ macro(CheckWayland)
        sdl_link_dependency(wayland LIBS PkgConfig::PC_WAYLAND PKG_CONFIG_PREFIX PC_WAYLAND PKG_CONFIG_SPECS ${WAYLAND_PKG_CONFIG_SPEC})
      endif()
      # xkbcommon doesn't provide internal version defines, so generate them here.
      if (PC_WAYLAND_xkbcommon_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)")
        set(SDL_XKBCOMMON_VERSION_MAJOR ${CMAKE_MATCH_1})
        set(SDL_XKBCOMMON_VERSION_MINOR ${CMAKE_MATCH_2})
        set(SDL_XKBCOMMON_VERSION_PATCH ${CMAKE_MATCH_3})
      else()
        message(WARNING "Failed to parse xkbcommon version; defaulting to lowest supported (0.5.0)")
        set(SDL_XKBCOMMON_VERSION_MAJOR 0)
        set(SDL_XKBCOMMON_VERSION_MINOR 5)
        set(SDL_XKBCOMMON_VERSION_PATCH 0)
      endif()
      if(SDL_WAYLAND_LIBDECOR)
        set(LibDecor_PKG_CONFIG_SPEC libdecor-0)
        pkg_check_modules(PC_LIBDECOR IMPORTED_TARGET ${LibDecor_PKG_CONFIG_SPEC})
@@ -825,29 +681,13 @@ macro(CheckOpenVR)
  endif()
 endmacro()
 # Requires
 # - N/A
 macro(FindOpenGLHeaders)
  find_package(OpenGL MODULE)
  # OPENGL_INCLUDE_DIRS is preferred over OPENGL_INCLUDE_DIR, but was only added in 3.29,
  # If the CMake minimum version is changed to be >= 3.29, the second check should be removed.
  if(OPENGL_INCLUDE_DIRS)
    list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIRS})
  elseif(OPENGL_INCLUDE_DIR)
    list(APPEND CMAKE_REQUIRED_INCLUDES ${OPENGL_INCLUDE_DIR})
  endif()
 endmacro()
 # Requires:
 # - nada
 macro(CheckGLX)
  if(SDL_OPENGL)
    cmake_push_check_state()
    FindOpenGLHeaders()
    check_c_source_compiles("
        #include <GL/glx.h>
        int main(int argc, char** argv) { return 0; }" HAVE_OPENGL_GLX)
    cmake_pop_check_state()
    if(HAVE_OPENGL_GLX AND NOT HAVE_ROCKCHIP)
      set(SDL_VIDEO_OPENGL_GLX 1)
    endif()
@@ -881,13 +721,10 @@ endmacro()
 # - nada
 macro(CheckOpenGL)
  if(SDL_OPENGL)
    cmake_push_check_state()
    FindOpenGLHeaders()
    check_c_source_compiles("
        #include <GL/gl.h>
        #include <GL/glext.h>
        int main(int argc, char** argv) { return 0; }" HAVE_OPENGL)
    cmake_pop_check_state()
    if(HAVE_OPENGL)
      set(SDL_VIDEO_OPENGL 1)
      set(SDL_VIDEO_RENDER_OGL 1)
@@ -900,7 +737,6 @@ endmacro()
 macro(CheckOpenGLES)
  if(SDL_OPENGLES)
    cmake_push_check_state()
    FindOpenGLHeaders()
    list(APPEND CMAKE_REQUIRED_INCLUDES "${SDL3_SOURCE_DIR}/src/video/khronos")
    check_c_source_compiles("
        #include <GLES/gl.h>
@@ -959,7 +795,7 @@ endmacro()
 macro(CheckPTHREAD)
  cmake_push_check_state()
  if(SDL_PTHREADS)
-    if(ANDROID OR SDL_PTHREADS_PRIVATE)
+    if(ANDROID)
      # the android libc provides built-in support for pthreads, so no
      # additional linking or compile flags are necessary
    elseif(LINUX)
@@ -1006,9 +842,6 @@ macro(CheckPTHREAD)
      set(PTHREAD_LDFLAGS "-pthread")
    elseif(QNX)
      # pthread support is baked in
    elseif(HURD)
      set(PTHREAD_CFLAGS "-D_REENTRANT")
      set(PTHREAD_LDFLAGS "-pthread")
    else()
      set(PTHREAD_CFLAGS "-D_REENTRANT")
      set(PTHREAD_LDFLAGS "-lpthread")
@@ -1260,7 +1093,7 @@ macro(CheckHIDAPI)
      if(LibUSB_FOUND)
        cmake_push_check_state()
        list(APPEND CMAKE_REQUIRED_LIBRARIES LibUSB::LibUSB)
-        check_c_source_compiles_static("
+        check_c_source_compiles("
          #include <stddef.h>
          #include <libusb.h>
          int main(int argc, char **argv) {
@@ -1291,7 +1124,6 @@ macro(CheckHIDAPI)
        set(HAVE_SDL_JOYSTICK TRUE)
        set(HAVE_HIDAPI_JOYSTICK TRUE)
        sdl_glob_sources("${SDL3_SOURCE_DIR}/src/joystick/hidapi/*.c")
        sdl_glob_sources("${SDL3_SOURCE_DIR}/src/haptic/hidapi/*.c")
      endif()
    else()
      set(SDL_HIDAPI_DISABLED 1)
--- a/cmake/sdlcompilers.cmake
+++ b/cmake/sdlcompilers.cmake
@@ -3,7 +3,6 @@ macro(SDL_DetectCompiler)
  set(USE_GCC FALSE)
  set(USE_INTELCC FALSE)
  set(USE_QCC FALSE)
  set(USE_TCC FALSE)
  if(CMAKE_C_COMPILER_ID MATCHES "Clang|IntelLLVM")
    set(USE_CLANG TRUE)
    # Visual Studio 2019 v16.2 added support for Clang/LLVM.
@@ -17,8 +16,6 @@ macro(SDL_DetectCompiler)
    set(USE_INTELCC TRUE)
  elseif(CMAKE_C_COMPILER_ID MATCHES "QCC")
    set(USE_QCC TRUE)
  elseif(CMAKE_C_COMPILER_ID MATCHES "TinyCC")
    set(USE_TCC TRUE)
  endif()
 endmacro()
@@ -42,7 +39,7 @@ function(SDL_AddCommonCompilerFlags TARGET)
    cmake_pop_check_state()
  endif()
-  if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC OR USE_TCC)
+  if(USE_GCC OR USE_CLANG OR USE_INTELCC OR USE_QCC)
    if(MINGW)
      # See if GCC's -gdwarf-4 is supported
      # See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101377 for why this is needed on Windows
@@ -162,10 +159,6 @@ function(SDL_AddCommonCompilerFlags TARGET)
      sdl_target_compile_option_all_languages(${TARGET} "-fdiagnostics-color=always")
    endif()
  endif()
  if(USE_TCC)
      sdl_target_compile_option_all_languages(${TARGET} "-DSTBI_NO_SIMD")
  endif()
 endfunction()
 function(check_x86_source_compiles BODY VAR)
--- a/cmake/sdlcpu.cmake
+++ b/cmake/sdlcpu.cmake
@@ -1,6 +1,6 @@
 function(SDL_DetectTargetCPUArchitectures DETECTED_ARCHS)
-  set(known_archs EMSCRIPTEN ARM32 ARM64 ARM64EC LOONGARCH64 POWERPC32 POWERPC64 RISCV32 RISCV64 X86 X64)
+  set(known_archs EMSCRIPTEN ARM32 ARM64 ARM64EC LOONGARCH64 POWERPC32 POWERPC64 X86 X64)
  if(APPLE AND CMAKE_OSX_ARCHITECTURES)
    foreach(known_arch IN LISTS known_archs)
@@ -39,8 +39,6 @@ function(SDL_DetectTargetCPUArchitectures DETECTED_ARCHS)
  set(arch_check_LOONGARCH64 "defined(__loongarch64)")
  set(arch_check_POWERPC32 "(defined(__PPC__) || defined(__powerpc__)) && !defined(__powerpc64__)")
  set(arch_check_POWERPC64 "defined(__PPC64__) || defined(__powerpc64__)")
  set(arch_check_RISCV32 "defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 32")
  set(arch_check_RISCV64 "defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64")
  set(arch_check_X86 "defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) ||defined( __i386) || defined(_M_IX86)")
  set(arch_check_X64 "(defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)) && !defined(_M_ARM64EC)")
--- a/Show More
+++ b/Show More