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

[cmake] fix boost comp options, add rapidjson endian, clang/amd64 error

Browse source 
Signed-off-by: crueter <crueter@crueter.xyz>
This commit is contained in:
crueter 2025-09-08 01:24:04 -04:00 • committed by crueter
parent 07410168d3
commit 21b56f5208
Signed by: crueter
GPG key ID: 425ACD2D4830EBC6
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
.patch/boost/0003-armasm-options.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8210f65..108ac88 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,7 +174,7 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
set(IMPL_SOURCES ${ASM_SOURCES} src/fcontext.cpp)
- if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm)
+ if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm OR BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/nologo")

5
CMakeLists.txt
View file

@ -91,6 +91,7 @@ if (MSVC AND CXX_CLANG)
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-sign-conversion>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-reserved-identifier>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations> $<$<COMPILE_LANGUAGE:C,CXX>:-Wno-deprecated-declarations>
$<$<COMPILE_LANGUAGE:C,CXX>:-Wno-cast-function-type-mismatch>
) )
if (ARCHITECTURE_x86_64) if (ARCHITECTURE_x86_64)
@ -468,6 +469,10 @@ endif()
# DiscordRPC # DiscordRPC
if (USE_DISCORD_PRESENCE) if (USE_DISCORD_PRESENCE)
if (ARCHITECTURE_arm64)
add_compile_definitions(RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN)
endif()
AddJsonPackage(discord-rpc) AddJsonPackage(discord-rpc)
target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include) target_include_directories(discord-rpc INTERFACE ${discord-rpc_SOURCE_DIR}/include)