From 2434c5c105e0fbcbb66eb4e6d15cf8c62c241e67 Mon Sep 17 00:00:00 2001 From: crueter Date: Tue, 26 Aug 2025 21:03:22 -0400 Subject: [PATCH] [cmake] fix non-linux boost_container, sdl2 dupe Signed-off-by: crueter --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 777e6e1cbd..d019731cfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -400,6 +400,10 @@ if (YUZU_USE_CPM) if (NOT MSVC) # boost sucks + if (NOT PLATFORM_LINUX AND NOT ANDROID) + target_compile_options(boost_container INTERFACE -pthread) + endif() + target_compile_options(boost_heap INTERFACE -Wno-shadow) target_compile_options(boost_icl INTERFACE -Wno-shadow) target_compile_options(boost_asio INTERFACE -Wno-conversion -Wno-implicit-fallthrough) @@ -558,9 +562,7 @@ if (ENABLE_SDL2) else() AddJsonPackage("sdl2_generic") endif() - endif() - - if (YUZU_USE_BUNDLED_SDL2) + elseif (YUZU_USE_BUNDLED_SDL2) message(STATUS "Using bundled SDL2") AddJsonPackage(sdl2) endif()