fixup

CMakeLists.txt

@@ -193,8 +193,6 @@ cmake_dependent_option(YUZU_USE_BUNDLED_SDL2 "Download bundled SDL2 build" "${MS
 
 option(ENABLE_CUBEB "Enables the cubeb audio backend" ON)
 
-# See https://github.com/llvm/llvm-project/issues/123946
-# OpenBSD va_list doesn't play nice with precompiled headers
 set(EXT_DEFAULT OFF)
 if (MSVC OR ANDROID)
     set(EXT_DEFAULT ON)
@@ -313,7 +311,6 @@ if (YUZU_LEGACY)
     add_compile_definitions(YUZU_LEGACY)
 endif()
 
-# TODO: APPLE
 if (ARCHITECTURE_arm64 AND (ANDROID OR PLATFORM_LINUX))
     set(HAS_NCE 1)
     add_compile_definitions(HAS_NCE=1)
@@ -466,15 +463,16 @@ if (YUZU_USE_CPM)
         add_library(zstd::libzstd ALIAS libzstd_static)
     endif()
 
-    # Opus
-    AddJsonPackage(opus)
-    if (Opus_ADDED)
-        if (MSVC AND CXX_CLANG)
-            target_compile_options(opus PRIVATE
-                -Wno-implicit-function-declaration
-            )
+    if (NOT YUZU_STATIC_ROOM)
+        # nlohmann
+        AddJsonPackage(nlohmann)
+
+        # zlib
+        AddJsonPackage(zlib)
+
+        if (ZLIB_ADDED)
+            add_library(ZLIB::ZLIB ALIAS zlibstatic)
         endif()
-    endif()
 
         # Opus
         AddJsonPackage(opus)