Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 13:45:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MVDM] Use again the correct CMAKE_C_COMPILER to pre-process the ASM code (addendum to 09c06a2f).

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2019-01-27 01:44:21 +01:00
parent 6b1e1df5c9
commit 19f6fc2525
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
subsystems/mvdm/asm16.cmake
View file

@ -106,10 +106,15 @@ function(add_asm16_bin _target _binary_file _base_address)
set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file})
endif()
# FIXME: clang-cl can't compile this so use cl here instead of ${CMAKE_C_COMPILER} in the meantime
if(USE_CLANG_CL)
set(_no_std_includes_flag "-nostdinc")
else()
set(_no_std_includes_flag "/X")
endif()
add_custom_command(
OUTPUT ${_preprocessed_asm_file} ${_object_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} && ${_pp_asm16_compile_command}
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}
DEPENDS ${_concatenated_asm_file})
add_custom_command(