[ros-diffs] [reactos] 04/06: [MVDM] hack-fix Clang-CL build

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0493e8e43229ceb25436d…

commit 0493e8e43229ceb25436d0a97134cc246e6e4851
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Sun Feb 3 19:57:30 2019 +0100
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Tue Feb 12 19:31:33 2019 +0100

    [MVDM] hack-fix Clang-CL build
---
 subsystems/mvdm/asm16.cmake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/subsystems/mvdm/asm16.cmake b/subsystems/mvdm/asm16.cmake
index 8cc77dd1d5..7d4832f354 100644
--- a/subsystems/mvdm/asm16.cmake
+++ b/subsystems/mvdm/asm16.cmake
@@ -113,10 +113,16 @@ function(add_asm16_bin _target _binary_file _base_address)
     endif()
 
     add_custom_command(
-        OUTPUT ${_preprocessed_asm_file} ${_object_file}
-        COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag}
/I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm
${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML
/EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file} &&
${_pp_asm16_compile_command}
+        OUTPUT ${_preprocessed_asm_file}
+        #COMMAND ${CMAKE_C_COMPILER} /nologo ${_no_std_includes_flag}
/I${REACTOS_SOURCE_DIR}/sdk/include/asm /I${REACTOS_BINARY_DIR}/sdk/include/asm
${_directory_includes} ${_source_file_defines} ${_directory_defines} /D__ASM__ /D_USE_ML
/EP /c ${_concatenated_asm_file} > ${_preprocessed_asm_file}
+        COMMAND cl /nologo /X /I${REACTOS_SOURCE_DIR}/sdk/include/asm
/I${REACTOS_BINARY_DIR}/sdk/include/asm ${_directory_includes} ${_source_file_defines}
${_directory_defines} /D__ASM__ /D_USE_ML /EP /c ${_concatenated_asm_file} >
${_preprocessed_asm_file}
         DEPENDS ${_concatenated_asm_file})
 
+    add_custom_command(
+        OUTPUT ${_object_file}
+        COMMAND ${_pp_asm16_compile_command}
+        DEPENDS ${_preprocessed_asm_file})
+
     add_custom_command(
         OUTPUT ${_binary_file}
         COMMAND native-obj2bin ${_object_file} ${_binary_file} ${_base_address}