Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-10-31 05:40:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change how the boost target works; disable external warnings in MSVC

Browse source
This commit is contained in:
Hamish Milne 2019-12-30 00:51:06 +00:00 • committed by zhupengfei
parent a0ac302a93
commit 9877bf7d48
5 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/CMakeLists.txt
View file

@ -37,7 +37,7 @@ if (MSVC)
/Zo
/permissive-
/EHsc
/std:c++latest
/std:c++17
/volatile:iso
/Zc:externConstexpr
/Zc:inline
@ -46,6 +46,10 @@ if (MSVC)
add_compile_options(
/MP
/Zc:throwingNew
/experimental:external
/external:I "${CMAKE_SOURCE_DIR}/externals"
/external:anglebrackets
/external:W0
)
endif()

2
src/core/CMakeLists.txt
View file

@ -466,7 +466,7 @@ endif()
create_target_directory_groups(core)
target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core)
target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp fmt open_source_archives boost_libs)
target_link_libraries(core PUBLIC Boost::boost PRIVATE cryptopp fmt open_source_archives Boost::serialization)
if (ENABLE_WEB_SERVICE)
target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE)
target_link_libraries(core PRIVATE web_service)

2
src/video_core/CMakeLists.txt
View file

@ -94,7 +94,7 @@ endif()
create_target_directory_groups(video_core)
target_link_libraries(video_core PUBLIC common core)
target_link_libraries(video_core PRIVATE glad nihstro-headers boost_libs)
target_link_libraries(video_core PRIVATE glad nihstro-headers Boost::serialization)
if (ARCHITECTURE_x86_64)
target_link_libraries(video_core PUBLIC xbyak)