37 lines
2.8 KiB
Diff
37 lines
2.8 KiB
Diff
|
diff --git a/Source/ThirdParty/AngelScript/CMakeLists.txt b/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||
|
|
index 6709cf5fc..4842f20b1 100644
|
||
|
|
--- a/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||
|
|
+++ b/Source/ThirdParty/AngelScript/CMakeLists.txt
|
||
|
|
@@ -44,10 +44,10 @@ if (ARM)
|
||
|
|
elseif (MSVC AND URHO3D_64BIT)
|
||
|
|
enable_language (ASM_MASM)
|
||
|
|
# Commented out due to cmake bug - todo: Recheck if this workaround is still necessary when increasing CMake minimum version
|
||
|
|
- #set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
|
||
|
|
+ set (ASM_FILES source/as_callfunc_x64_msvc_asm.asm)
|
||
|
|
# As a temporary workaround
|
||
|
|
- add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM")
|
||
|
|
- set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
|
||
|
|
+ #add_custom_command (OUTPUT as_callfunc_x64_msvc_asm.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM")
|
||
|
|
+ #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/as_callfunc_x64_msvc_asm.obj ${CMAKE_CURRENT_SOURCE_DIR}/source/as_callfunc_x64_msvc_asm.asm)
|
||
|
|
endif ()
|
||
|
|
list (APPEND SOURCE_FILES ${ASM_FILES})
|
||
|
|
|
||
|
|
diff --git a/Source/ThirdParty/LibCpuId/CMakeLists.txt b/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||
|
|
index 0aecafb06..677fd4b84 100644
|
||
|
|
--- a/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||
|
|
+++ b/Source/ThirdParty/LibCpuId/CMakeLists.txt
|
||
|
|
@@ -33,10 +33,10 @@ endif ()
|
||
|
|
if (MSVC AND URHO3D_64BIT)
|
||
|
|
enable_language (ASM_MASM)
|
||
|
|
# Commented out due to cmake bug
|
||
|
|
- #set (ASM_FILES src/masm-x64.asm)
|
||
|
|
+ set (ASM_FILES src/masm-x64.asm)
|
||
|
|
# As a temporary workaround
|
||
|
|
- add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM")
|
||
|
|
- set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
|
||
|
|
+ #add_custom_command (OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -Fo ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj -c ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm COMMENT "Temporary workaround for MASM")
|
||
|
|
+ #set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/src/masm-x64.asm)
|
||
|
|
endif ()
|
||
|
|
|
||
|
|
# Define source files
|