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

[cmake] enable clang-cl and WoA builds #348

Merged
crueter merged 31 commits from liz-clang-cl-cmake into master 2025-09-09 20:47:51 +02:00
Conversation 9 Commits 31 Files changed 276 +35 -35
3 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6ef1611d97 - Show all commits

26
.patch/boost/0001-clang-cl.patch
View file

@ -1,13 +1,13 @@
diff --git a/libs/cobalt/include/boost/cobalt/concepts.hpp b/libs/cobalt/include/boost/cobalt/concepts.hpp diff --git a/libs/cobalt/include/boost/cobalt/concepts.hpp b/libs/cobalt/include/boost/cobalt/concepts.hpp
index d49f2ec..a9bdb80 100644 index d49f2ec..a9bdb80 100644
--- a/libs/cobalt/include/boost/cobalt/concepts.hpp --- a/libs/cobalt/include/boost/cobalt/concepts.hpp
+++ b/libs/cobalt/include/boost/cobalt/concepts.hpp +++ b/libs/cobalt/include/boost/cobalt/concepts.hpp
@@ -62,7 +62,7 @@ struct enable_awaitables @@ -62,7 +62,7 @@ struct enable_awaitables
template <typename T> template <typename T>
concept with_get_executor = requires (T& t) concept with_get_executor = requires (T& t)
{ {
- {t.get_executor()} -> asio::execution::executor; - {t.get_executor()} -> asio::execution::executor;
+ t.get_executor(); + t.get_executor();
}; };

16
.patch/boost/0002-use-marmasm.patch
View file

@ -1,11 +1,11 @@
--- a/libs/context/CMakeLists.txt 2025-09-08 00:42:31.303651800 -0400 --- a/libs/context/CMakeLists.txt 2025-09-08 00:42:31.303651800 -0400
+++ b/libs/context/CMakeLists.txt 2025-09-08 00:42:40.592184300 -0400 +++ b/libs/context/CMakeLists.txt 2025-09-08 00:42:40.592184300 -0400
@@ -146,7 +146,7 @@ @@ -146,7 +146,7 @@
set(ASM_LANGUAGE ASM) set(ASM_LANGUAGE ASM)
endif() endif()
elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
- set(ASM_LANGUAGE ASM_ARMASM) - set(ASM_LANGUAGE ASM_ARMASM)
+ set(ASM_LANGUAGE ASM_MARMASM) + set(ASM_LANGUAGE ASM_MARMASM)
else() else()
set(ASM_LANGUAGE ASM_MASM) set(ASM_LANGUAGE ASM_MASM)
endif() endif()

28
.patch/boost/0003-armasm-options.patch
View file

@ -1,14 +1,14 @@
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
index d6be702..0e59dd7 100644 index 8210f65..0e59dd7 100644
--- a/libs/context/CMakeLists.txt --- a/libs/context/CMakeLists.txt
+++ b/libs/context/CMakeLists.txt +++ b/libs/context/CMakeLists.txt
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext") @@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh") set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
endif() endif()
- elseif() # masm - else() # masm
+ # armasm doesn't support most of these options + # armasm doesn't support most of these options
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm + elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")