From 024b7877b4f26e08f48ef1e59d8d7f98d657c842 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Mon, 13 Jul 2026 01:06:21 -0600 Subject: Fixed zlib on web --- CMakeLists.txt | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4d020b..3e5631c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -376,19 +376,25 @@ FetchContent_Declare( FetchContent_MakeAvailable(tinyxml2) # Link zlib -set(ZLIB_BUILD_SHARED_LIBS OFF CACHE BOOL "Build zlib as a static library" FORCE) -set(ZLIB_BUILD_TESTS OFF CACHE BOOL "Disable building zlib tests" FORCE) -set(SKIP_INSTALL_ALL ON CACHE BOOL "Skip zlib install targets" FORCE) +if(EMSCRIPTEN) + find_package(ZLIB REQUIRED) + set(TORCH_ZLIB_TARGET ZLIB::ZLIB) +else() + set(ZLIB_BUILD_SHARED_LIBS OFF CACHE BOOL "Build zlib as a static library" FORCE) + set(ZLIB_BUILD_TESTS OFF CACHE BOOL "Disable building zlib tests" FORCE) + set(SKIP_INSTALL_ALL ON CACHE BOOL "Skip zlib install targets" FORCE) -FetchContent_Declare( - zlib - GIT_REPOSITORY https://github.com/madler/zlib.git - GIT_TAG v1.3.1 - OVERRIDE_FIND_PACKAGE -) -FetchContent_MakeAvailable(zlib) + FetchContent_Declare( + zlib + GIT_REPOSITORY https://github.com/madler/zlib.git + GIT_TAG v1.3.1 + OVERRIDE_FIND_PACKAGE + ) + FetchContent_MakeAvailable(zlib) + set(TORCH_ZLIB_TARGET zlibstatic) +endif() -target_link_libraries(${PROJECT_NAME} PRIVATE tinyxml2 zlibstatic yaml-cpp N64Graphics BinaryTools) +target_link_libraries(${PROJECT_NAME} PRIVATE tinyxml2 ${TORCH_ZLIB_TARGET} yaml-cpp N64Graphics BinaryTools) if(BUILD_UI) target_link_libraries(${PROJECT_NAME} PRIVATE "$") -- cgit v1.2.3