lizzie
9d2681ecc9
Compilation and CMake fixes for both Windows on ARM and clang-cl, meaning Windows can now be built on both MSVC and clang on both amd64 and aarch64. Compiling on clang is *dramatically* faster so this should be useful for CI. Co-authored-by: crueter <crueter@eden-emu.dev> Co-authored-by: crueter <crueter@crueter.xyz> Reviewed-on: #348 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: crueter <crueter@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
14 lines
671 B
Diff
14 lines
671 B
Diff
diff --git a/libs/context/CMakeLists.txt b/libs/context/CMakeLists.txt
|
|
index 8210f65..0e59dd7 100644
|
|
--- a/libs/context/CMakeLists.txt
|
|
+++ b/libs/context/CMakeLists.txt
|
|
@@ -186,7 +186,8 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
|
|
endif()
|
|
|
|
- else() # masm
|
|
+ # armasm doesn't support most of these options
|
|
+ elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
|
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
|
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
|
|
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
|