Merge branch 'nightmareci:main' into main

zaphod77 · Dec 25, 2024 · 3d7a0f9 · 3d7a0f9
2 parents 94e8d28 + e29d597
commit 3d7a0f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dep/SDL b/dep/SDL
diff --git a/dep/SDL_image b/dep/SDL_image
+62 −0		.github/actions/setup-ninja/action.yml
+535 −0		.github/workflows/release.yml
+4 −0		.gitignore
+4 −4		.gitmodules
+4 −2		Android.mk
+19 −9		CMakeLists.txt
+1 −1		Makefile.os2
+1 −1		SDL2_imageConfig.cmake.in
+13 −28		VisualC/SDL_image.vcxproj
+4 −4		VisualC/Version.rc
+1 −1		VisualC/external/include/avif/avif.h
+ −		VisualC/external/optional/x64/libavif-16.dll
+ −		VisualC/external/optional/x86/libavif-16.dll
+1 −1		VisualC/pkg-support/cmake/sdl2_image-config.cmake
+19 −64		VisualC/showimage/showimage.vcxproj
+2 −2		Xcode/Info-Framework.plist
+2 −2		Xcode/SDL_image.xcodeproj/project.pbxproj
+33 −2		Xcode/avif/avif.xcodeproj/project.pbxproj
+21 −0		Xcode/pkg-support/build.xcconfig
+1 −1		acinclude/sdl2.m4
+1,469 −0		build-scripts/build-release.py
+18 −0		build-scripts/cmake-toolchain-mingw64-i686.cmake
+18 −0		build-scripts/cmake-toolchain-mingw64-x86_64.cmake
+45 −0		build-scripts/create-release.py
+147 −0		build-scripts/release-info.json
+0 −8		build-scripts/test-versioning.sh
+3 −3		cmake/CommonFindSDL2.cmake
+1 −1		cmake/Findwebp.cmake
+1 −1		cmake/PrivateSdlFunctions.cmake
+14 −6		config.guess
+573 −179		config.sub
+87 −37		configure
+32 −12		configure.ac
+7 −2		external/Get-GitModules.ps1
+1 −1		external/dav1d
+8 −1		external/download.sh
+1 −1		external/jpeg
+1 −1		external/libavif
+1 −1		external/libpng
+1 −1		external/libwebp
+1 −1		external/zlib
+1 −1		include/SDL_image.h
+35 −0		mingw/pkg-support/Makefile
+1 −1		src/IMG_avif.c
+75 −66		src/IMG_jpg.c
+1 −1		src/IMG_jxl.c
+242 −208		src/IMG_png.c
+2 −2		src/IMG_webp.c
+1 −1		src/nanosvg.h
+1 −1		src/nanosvgrast.h
+4 −4		src/version.rc
+1 −1		test/main.c