diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e0d0d0b..f68ea42 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: - { name: linux-x86, os: ubuntu-22.04, flags: -GNinja -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DWAVPACK_ENABLE_ASM=OFF, target_apt_arch: ":i386" } - { name: linux-arm64, os: ubuntu-22.04-arm, flags: -GNinja, target_apt_arch: ":arm64", container: "arm64v8/ubuntu:22.04" } - { name: linux-arm, os: ubuntu-22.04-arm, flags: -GNinja -DCMAKE_C_FLAGS=-mfpu=neon -DCMAKE_CXX_FLAGS=-mfpu=neon, target_apt_arch: ":armhf", container: "arm32v7/ubuntu:22.04" } - - { name: osx-x64, os: macos-13, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 } + - { name: osx-x64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 } # NOTE: macOS 11.0 is the first released supported by Apple Silicon. - { name: osx-arm64, os: macos-latest, flags: -DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11.0 } - { name: android-arm64, os: ubuntu-22.04, flags: -GNinja, abi: arm64-v8a } diff --git a/External/SDL b/External/SDL index c15ca27..550394e 160000 --- a/External/SDL +++ b/External/SDL @@ -1 +1 @@ -Subproject commit c15ca27740a1591fab938dfb6934b37133052978 +Subproject commit 550394eecdc250c7ce542a99f0c2b55683521656 diff --git a/External/SDL_image b/External/SDL_image index 96ade18..8bd9f3d 160000 --- a/External/SDL_image +++ b/External/SDL_image @@ -1 +1 @@ -Subproject commit 96ade18124e7059a43973ff0ceb108369c3a10a0 +Subproject commit 8bd9f3d7f2d2bb59ce4331f13b77d65254cd8c7b diff --git a/External/SDL_mixer b/External/SDL_mixer index 37b2f33..995c65d 160000 --- a/External/SDL_mixer +++ b/External/SDL_mixer @@ -1 +1 @@ -Subproject commit 37b2f3325a0fb1e98ba265aa38826aa9e16624fb +Subproject commit 995c65db13d065fd76ddc147a402dd06bb0f094e diff --git a/External/SDL_ttf b/External/SDL_ttf index 079cd92..053bbc8 160000 --- a/External/SDL_ttf +++ b/External/SDL_ttf @@ -1 +1 @@ -Subproject commit 079cd92d02ed5b2391d9c469ff6d04d4f967b3d9 +Subproject commit 053bbc89517471427748a082583c9eada55c07b5 diff --git a/External/build.sh b/External/build.sh index 0e41c51..0052f24 100755 --- a/External/build.sh +++ b/External/build.sh @@ -181,6 +181,6 @@ run_cmake SDL_image ${OUTPUT_LIB/variant/_image} -DCMAKE_PREFIX_PATH=$CMAKE_PREF # -DSDLMIXER_MP3_MPG123=OFF is used because upstream build is broken. Fallback to dr_mp3. # See: https://github.com/libsdl-org/SDL_mixer/pull/744#issuecomment-3180682130 # Fixing using the proposed solution causes more issues. -run_cmake SDL_mixer ${OUTPUT_LIB/variant/_mixer} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_MP3_MPG123=OFF -DSDLMIXER_DEPS_SHARED=OFF -DSDLMIXER_VENDORED=ON +run_cmake SDL_mixer ${OUTPUT_LIB/variant/_mixer} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_MP3_MPG123=OFF -DSDLMIXER_DEPS_SHARED=OFF -DSDLMIXER_VENDORED=ON -DSDLMIXER_TESTS=OFF -DSDLMIXER_EXAMPLES=OFF popd diff --git a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs index 45271c5..6938507 100644 --- a/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs +++ b/SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs @@ -565,8 +565,8 @@ namespace SDL [NativeTypeName("#define SDL_HINT_OPENGL_ES_DRIVER \"SDL_OPENGL_ES_DRIVER\"")] public static ReadOnlySpan SDL_HINT_OPENGL_ES_DRIVER => "SDL_OPENGL_ES_DRIVER"u8; - [NativeTypeName("#define SDL_HINT_OPENGL_FORCE_SRGB_CAPABLE \"SDL_OPENGL_FORCE_SRGB_CAPABLE\"")] - public static ReadOnlySpan SDL_HINT_OPENGL_FORCE_SRGB_CAPABLE => "SDL_OPENGL_FORCE_SRGB_CAPABLE"u8; + [NativeTypeName("#define SDL_HINT_OPENGL_FORCE_SRGB_FRAMEBUFFER \"SDL_OPENGL_FORCE_SRGB_FRAMEBUFFER\"")] + public static ReadOnlySpan SDL_HINT_OPENGL_FORCE_SRGB_FRAMEBUFFER => "SDL_OPENGL_FORCE_SRGB_FRAMEBUFFER"u8; [NativeTypeName("#define SDL_HINT_OPENVR_LIBRARY \"SDL_OPENVR_LIBRARY\"")] public static ReadOnlySpan SDL_HINT_OPENVR_LIBRARY => "SDL_OPENVR_LIBRARY"u8;