diff options
| author | KiritoDv <kiritodev01@gmail.com> | 2026-07-13 01:06:21 -0600 |
|---|---|---|
| committer | KiritoDv <kiritodev01@gmail.com> | 2026-07-13 01:06:21 -0600 |
| commit | 024b7877b4f26e08f48ef1e59d8d7f98d657c842 (patch) | |
| tree | f7e563a4ac24d0c2c14e3cf036a472fc902eaf30 | |
| parent | fb9768aa46fa51050cb8abb9c1a350b1371ca1c7 (diff) | |
Fixed zlib on web
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files 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 "$<LINK_LIBRARY:WHOLE_ARCHIVE,libultraship>") |