summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2023-06-07 02:19:44 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2023-06-07 02:20:09 +0200
commitf62f43c0dae041b1a7dd282d3f1c055fa7038649 (patch)
tree1b5469eb2a1bf536d4fa3ab061cf4a205cabbc51
parentMerge pull request #10651 from Morph1984/a (diff)
downloadyuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.tar
yuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.tar.gz
yuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.tar.bz2
yuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.tar.lz
yuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.tar.xz
yuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.tar.zst
yuzu-f62f43c0dae041b1a7dd282d3f1c055fa7038649.zip
Diffstat (limited to '')
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt6
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30a3c939e..3d03bbf94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,7 +255,7 @@ endif()
# boost asio's concept usage doesn't play nicely with some compilers yet.
add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
if (MSVC)
- add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++latest>)
+ add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++20>)
# boost still makes use of deprecated result_of.
add_definitions(-D_HAS_DEPRECATED_RESULT_OF)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 55b113297..0696201df 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,7 +43,7 @@ if (MSVC)
/Zo
/permissive-
/EHsc
- /std:c++latest
+ /std:c++20
/utf-8
/volatile:iso
/Zc:externConstexpr
@@ -51,8 +51,10 @@ if (MSVC)
/Zc:throwingNew
/GT
+ # Modules
+ /experimental:module- # Disable module support explicitly due to conflicts with precompiled headers
+
# External headers diagnostics
- /experimental:external # Enables the external headers options. This option isn't required in Visual Studio 2019 version 16.10 and later
/external:anglebrackets # Treats all headers included by #include <header>, where the header file is enclosed in angle brackets (< >), as external headers
/external:W0 # Sets the default warning level to 0 for external headers, effectively turning off warnings for external headers