ilusha/pbrt-v4
1
0
Fork 0
mirror of https://github.com/mmp/pbrt-v4 synced 2026-09-26 16:20:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Update to latest zlib released version

Browse source
This commit is contained in:
Matt Pharr 2025-10-22 11:41:43 -07:00
parent d5c8fce493
commit 90c73ac71a
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "src/ext/zlib"]
path = src/ext/zlib
url = https://github.com/mitsuba-renderer/zlib.git
[submodule "src/ext/ptex"]
path = src/ext/ptex
url = https://github.com/wdas/ptex.git
@ -36,3 +33,6 @@
path = src/ext/glfw
url = https://github.com/glfw/glfw.git
[submodule "src/ext/zlib"]
path = src/ext/zlib
url = https://github.com/madler/zlib.git

2
CMakeLists.txt
View file

@ -74,7 +74,7 @@ check_ext ("lodepng" "lodepng/examples" 8c6a9e30576f07bf470ad6f09458a2dcd7a6a84a
check_ext ("qoi" "qoi" 028c75fd26e5e0758c7c711216c00404994c1ad3)
check_ext ("stb" "stb/tools" af1a5bc352164740c1cc1354942b1c6b72eacb8a)
check_ext ("utf8proc" "utf8proc/bench" 2484e2ed5e1d9c19edcccf392a7d9920ad90dfaf)
check_ext ("zlib" "zlib/doc" 54d591eabf9fe0e84c725638f8d5d8d202a093fa)
check_ext ("zlib" "zlib/doc" 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71)
add_compile_definitions ("$<$<CONFIG:DEBUG>:PBRT_DEBUG_BUILD>")
enable_testing ()

5
src/ext/CMakeLists.txt
View file

@ -82,7 +82,10 @@ add_subdirectory (double-conversion)
set (DOUBLE_CONVERSION_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/double-conversion PARENT_SCOPE)
set_property (TARGET double-conversion cctest PROPERTY FOLDER "ext")
set_property (TARGET double-conversion PROPERTY FOLDER "ext")
if (TARGET cctest)
set_property (TARGET cctest PROPERTY FOLDER "ext")
endif()
###########################################################################
# nanovdb

2
src/ext/zlib

@ -1 +1 @@
Subproject commit 54d591eabf9fe0e84c725638f8d5d8d202a093fa
Subproject commit 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71