eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 57 Projects 1 Releases Packages Wiki Activity Actions

[cmake] refactor: cpmfile, deps prefetch, force system and more #322

Merged
CamilleLaVey merged 18 commits from refactor/cpmfile into master 2025-08-29 00:18:03 +02:00
Conversation 2 Commits 18 Files changed 23 +5 -3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2434c5c105 - Show all commits

8
CMakeLists.txt
View file

@ -400,6 +400,10 @@ if (YUZU_USE_CPM)
if (NOT MSVC) if (NOT MSVC)
# boost sucks # 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_heap INTERFACE -Wno-shadow)
target_compile_options(boost_icl INTERFACE -Wno-shadow) target_compile_options(boost_icl INTERFACE -Wno-shadow)
target_compile_options(boost_asio INTERFACE -Wno-conversion -Wno-implicit-fallthrough) target_compile_options(boost_asio INTERFACE -Wno-conversion -Wno-implicit-fallthrough)
@ -558,9 +562,7 @@ if (ENABLE_SDL2)
else() else()
AddJsonPackage("sdl2_generic") AddJsonPackage("sdl2_generic")
endif() endif()
endif() elseif (YUZU_USE_BUNDLED_SDL2)
if (YUZU_USE_BUNDLED_SDL2)
message(STATUS "Using bundled SDL2") message(STATUS "Using bundled SDL2")
AddJsonPackage(sdl2) AddJsonPackage(sdl2)
endif() endif()