mirror of
https://github.com/VSadov/Satori.git
synced 2025-06-08 03:27:04 +09:00
fix after rebase
This commit is contained in:
parent
eb380d22d5
commit
2041c7adf9
2 changed files with 4 additions and 4 deletions
|
@ -213,10 +213,10 @@ if(CLR_CMAKE_HOST_UNIX)
|
|||
add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-conversion-null>)
|
||||
add_compile_options($<$<COMPILE_LANG_AND_ID:CXX,GNU>:-Wno-pointer-arith>)
|
||||
|
||||
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM64)
|
||||
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)
|
||||
# Allow 16 byte compare-exchange
|
||||
add_compile_options(-mcx16)
|
||||
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM64)
|
||||
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)
|
||||
|
||||
set (NATIVE_RESOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/nativeresources)
|
||||
include_directories(${NATIVE_RESOURCE_DIR})
|
||||
|
|
|
@ -24,10 +24,10 @@ if(CLR_CMAKE_HOST_UNIX)
|
|||
add_definitions(-DFEATURE_OBJCMARSHAL)
|
||||
endif(CLR_CMAKE_TARGET_APPLE)
|
||||
|
||||
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM64)
|
||||
if(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)
|
||||
# Allow 16 byte compare-exchange
|
||||
add_compile_options(-mcx16)
|
||||
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386 OR CLR_CMAKE_TARGET_ARCH_ARM64)
|
||||
endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386)
|
||||
endif (CLR_CMAKE_HOST_UNIX)
|
||||
|
||||
if(CLR_CMAKE_TARGET_ANDROID)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue