Skip to content

Commit 68bdd77

Browse files
committed
bump vendored libpng from 1.6.40 to 1.6.41 and zlib from 1.3 to 1.3.1.
1 parent b096a6d commit 68bdd77

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[submodule "external/libpng"]
1010
path = external/libpng
1111
url = https://github.com/libsdl-org/libpng.git
12-
branch = v1.6.40-SDL
12+
branch = v1.6.41-SDL
1313
[submodule "external/libwebp"]
1414
path = external/libwebp
1515
url = https://github.com/libsdl-org/libwebp.git
@@ -21,7 +21,7 @@
2121
[submodule "external/zlib"]
2222
path = external/zlib
2323
url = https://github.com/libsdl-org/zlib.git
24-
branch = v1.3-SDL
24+
branch = v1.3.1-SDL
2525
[submodule "external/libjxl"]
2626
path = external/libjxl
2727
url = https://github.com/libsdl-org/libjxl.git

CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,8 @@ if(SDL3IMAGE_ZLIB)
399399
message(STATUS "${PROJECT_NAME}: Using vendored zlib")
400400
sdl_check_project_in_subfolder(external/zlib zlib SDL3IMAGE_VENDORED)
401401
add_subdirectory(external/zlib EXCLUDE_FROM_ALL)
402+
# disable build of zlib example programs:
403+
set(ZLIB_BUILD_EXAMPLES OFF CACHE BOOL "zlib examples" FORCE)
402404
# PNG_BUILD_ZLIB variable is used by vendored libpng
403405
set(PNG_BUILD_ZLIB ON CACHE BOOL "libpng option to tell it should use 'our' vendored ZLIB library" FORCE)
404406
# ZLIB_INCLUDE_DIR variable is used by vendored libpng

external/libpng

Submodule libpng updated 96 files

external/zlib

Submodule zlib updated 73 files

0 commit comments

Comments
 (0)