ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE][MVDM] Fix CMAKE_ASM16_COMPILER for non-x86 MSVC builds

Browse Source 
Ensure that CMAKE_ASM16_COMPILER is 32-bit MASM.
It is used only for compiling 16-bit x86 ASM code on non-x86 builds.

Original patch by serrox. CORE-10452, CORE-17604

Co-authored-by: Sergey Chernov <[email protected]>
This commit is contained in:
Adam Słaboń
2023-08-05 16:20:22 +02:00
co-authored by Sergey Chernov
parent ffbc81fdf2
commit 2ffcda90b2
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
subsystems/mvdm/asm16.cmake
+1 -5
View File
@@ -112,11 +112,7 @@ function(add_asm16_bin _target _binary_file _base_address)
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})
if(ARCH STREQUAL "arm")
set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} -nologo -o ${_object_file} ${_preprocessed_asm_file})
else()
set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file})
endif()
set(_pp_asm16_compile_command ${CMAKE_ASM16_COMPILER} /nologo /Cp /Fo${_object_file} /c /Ta ${_preprocessed_asm_file})
add_custom_command(
OUTPUT ${_object_file}