mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 20:39:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
da0f1cc2bb
vcpkg/ports/urho3d/asm_files.patch

37 lines
2.8 KiB
Diff
Raw Normal View History

[urho3d] Add new port (#14538) * [urho3d] Add new port * [urho3d] Build master branch * [urho3d] Fix osx build * [urho3d] Fix windows build * [urho3d] Update to newest version * [urho3d] Add versions info * [urho3d] arm and uwp are not supported * [urho3d] Update versions info * [urho3d] Convert CONTROL to vcpkg.json * [urho3d] Update portfile.cmake to use newer cmake functions * [urho3d] Fix ExternalProject_Add error * [urho3d] Update versions info
2021-04-29 08:32:42 +08:00
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
Reference in New Issue Copy Permalink