Skip to content

Update to latest main + regenerate bindings + fix builds #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Susko3 merged 4 commits into from
Feb 25, 2026
Merged

Update to latest main + regenerate bindings + fix builds #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df55294
Update submodules to latest main
smoogipoo Feb 24, 2026
cc6c51b
Update bindings
smoogipoo Feb 24, 2026
93fb8ca
Fix osx-x64 build
smoogipoo Feb 24, 2026
5f1684a
Disable building SDL_mixer tests/examples
smoogipoo Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion External/SDL
Open in desktop
Submodule SDL updated 131 files
2 changes: 1 addition & 1 deletion External/SDL_image
Open in desktop
Submodule SDL_image updated 15 files
+3 −3 .gitmodules
+7 −7 VisualC/external/include/png.h
+1 −1 VisualC/external/include/pngconf.h
+1 −1 VisualC/external/include/pnglibconf.h
+ − VisualC/external/optional/x64/libpng16-16.dll
+ − VisualC/external/optional/x86/libpng16-16.dll
+3 −3 examples/showimage.c
+1 −1 external/aom
+1 −1 external/dav1d
+1 −1 external/jpeg
+1 −1 external/libjxl
+1 −1 external/libpng
+1 −1 external/libwebp
+78 −3 src/IMG_anim_decoder.c
+2 −2 src/IMG_libpng.c
2 changes: 1 addition & 1 deletion External/SDL_mixer
Open in desktop
Submodule SDL_mixer updated 13 files
+ − examples/basics/01-load-and-play/onmouseover.webp
+ − examples/basics/01-load-and-play/thumbnail.png
+ − examples/basics/02-play-with-options/onmouseover.webp
+ − examples/basics/02-play-with-options/thumbnail.png
+ − examples/basics/03-play-multiple-sounds/onmouseover.webp
+ − examples/basics/03-play-multiple-sounds/thumbnail.png
+ − examples/basics/04-metadata/thumbnail.png
+ − examples/basics/05-sinewave/onmouseover.webp
+ − examples/basics/05-sinewave/thumbnail.png
+ − examples/basics/06-seeking/onmouseover.webp
+ − examples/basics/06-seeking/thumbnail.png
+49 −0 examples/save-rendering-to-bitmaps.h
+3 −3 examples/template.html
2 changes: 1 addition & 1 deletion External/SDL_ttf
Open in desktop
Submodule SDL_ttf updated 1 files
+0 −2 src/SDL_ttf.c
2 changes: 1 addition & 1 deletion External/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions SDL3-CS/SDL3/ClangSharp/SDL_hints.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,8 +565,8 @@ public static unsafe partial class SDL3
[NativeTypeName("#define SDL_HINT_OPENGL_ES_DRIVER \"SDL_OPENGL_ES_DRIVER\"")]
public static ReadOnlySpan<byte> 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<byte> 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<byte> SDL_HINT_OPENGL_FORCE_SRGB_FRAMEBUFFER => "SDL_OPENGL_FORCE_SRGB_FRAMEBUFFER"u8;

[NativeTypeName("#define SDL_HINT_OPENVR_LIBRARY \"SDL_OPENVR_LIBRARY\"")]
public static ReadOnlySpan<byte> SDL_HINT_OPENVR_LIBRARY => "SDL_OPENVR_LIBRARY"u8;
Expand Down
Loading