Просмотр исходного кода

Applied 64bit out-of-source build patch from Erik Beran.

Lasse Öörni 12 лет назад
Родитель
Сommit
f92b8f14aa
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      ThirdParty/AngelScript/CMakeLists.txt
  2. 2 2
      ThirdParty/LibCpuId/CMakeLists.txt

+ 2 - 2
ThirdParty/AngelScript/CMakeLists.txt

@@ -18,8 +18,8 @@ if (MSVC AND ENABLE_64BIT)
     #enable_language(ASM_MASM)
     #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} -c source/as_callfunc_x64_msvc_asm.asm DEPENDS source/as_callfunc_x64_msvc_asm.asm COMMENT "Temporary workaround for MASM") 
-    set (ASM_FILES as_callfunc_x64_msvc_asm.obj 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 ()
 
 set (SOURCE_FILES ${CPP_FILES} ${ASM_FILES} ${H_FILES})

+ 2 - 2
ThirdParty/LibCpuId/CMakeLists.txt

@@ -15,8 +15,8 @@ if (MSVC AND ENABLE_64BIT)
     #enable_language(ASM_MASM)
     #set (ASM_FILES libcpuid/masm-x64.asm)
     # As a temporary workaround
-    add_custom_command(OUTPUT masm-x64.obj COMMAND ${CMAKE_ASM_MASM_COMPILER} -c libcpuid/masm-x64.asm DEPENDS libcpuid/masm-x64.asm COMMENT "Temporary workaround for MASM") 
-    set (ASM_FILES masm-x64.obj libcpuid/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}/libcpuid/masm-x64.asm DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libcpuid/masm-x64.asm COMMENT "Temporary workaround for MASM") 
+    set (ASM_FILES ${CMAKE_CURRENT_BINARY_DIR}/masm-x64.obj ${CMAKE_CURRENT_SOURCE_DIR}/libcpuid/masm-x64.asm)
 endif ()
 
 set (SOURCE_FILES ${C_FILES} ${H_FILES} ${ASM_FILES})