From 78f758a463516a78a9ec8d472080c6e61cb89c7f Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 20 Aug 2021 20:20:01 -0700 Subject: Use dashes for MASM flags Microsoft's tools traditionally uses slashes, but accept dashes as well. If we use dashes, it becomes possible to use an alternative MASM-compatible assembler such as JWasm. --- Modules/CMakeASM_MASMInformation.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/CMakeASM_MASMInformation.cmake b/Modules/CMakeASM_MASMInformation.cmake index 6d1e174..656b75e 100644 --- a/Modules/CMakeASM_MASMInformation.cmake +++ b/Modules/CMakeASM_MASMInformation.cmake @@ -8,7 +8,7 @@ set(ASM_DIALECT "_MASM") set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS asm) -set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " /c /Fo ") +set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT " -c -Fo ") # The ASM_MASM compiler id for this compiler is "MSVC", so fill out the runtime library table. set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OPTIONS_MSVC_RUNTIME_LIBRARY_MultiThreaded "") -- cgit v0.12 From bf09145eb0cfc80068441631d0b106cc7948cff3 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 20 Aug 2021 20:20:37 -0700 Subject: Enable Watcom WMake generator on Darwin Open Watcom v2 runs on Mac OS and is useful there for doing cross-compilation. --- Source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 791871e..2e57a16 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -803,7 +803,7 @@ if (WIN32) endif () # Watcom support -if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux") +if(WIN32 OR CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Darwin") set_property(SOURCE cmake.cxx APPEND PROPERTY COMPILE_DEFINITIONS CMAKE_USE_WMAKE) list(APPEND SRCS cmGlobalWatcomWMakeGenerator.cxx -- cgit v0.12