gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2024-10-04 07:02:03 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Enable MASM automatically in runtime_lib.cmake (#2634)

Browse Source 
MASM (Microsoft Macro Assembler) needs to be enabled to successfully
compile .asm files on Windows. Without enabling this language
automatically in runtime_lib.cmake, Windows cmake projects using WAMR
get hard-to-diagnose linker errors about missing symbols as the assembly
file is not compiled at all.
This commit is contained in:
zoraaver 2023-10-12 13:42:25 +01:00 committed by GitHub
parent e222955f31
commit 5fd530610a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-scripts/runtime_lib.cmake
View File

@ -165,7 +165,11 @@ file (GLOB header
)
LIST (APPEND RUNTIME_LIB_HEADER_LIST ${header})
enable_language (ASM)
if (WAMR_BUILD_PLATFORM STREQUAL "windows")
enable_language (ASM_MASM)
else()
enable_language (ASM)
endif()
include (${SHARED_PLATFORM_CONFIG})
include (${SHARED_DIR}/mem-alloc/mem_alloc.cmake)

1
product-mini/platforms/windows/CMakeLists.txt
View File

@ -4,7 +4,6 @@
cmake_minimum_required (VERSION 2.9)
project (iwasm C ASM CXX)
enable_language(ASM_MASM)
# set (CMAKE_VERBOSE_MAKEFILE 1)
set (WAMR_BUILD_PLATFORM "windows")

1
samples/basic/CMakeLists.txt
View File

@ -9,7 +9,6 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
project (basic)
else()
project (basic C ASM)
enable_language (ASM_MASM)
endif()
################ runtime settings ################

1
samples/file/src/CMakeLists.txt
View File

@ -9,7 +9,6 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
project (iwasm)
else()
project (iwasm C ASM)
enable_language (ASM_MASM)
endif()
################ runtime settings ################

1
samples/inst-context-threads/CMakeLists.txt
View File

@ -9,7 +9,6 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
project (inst-context)
else()
project (inst-context C ASM)
enable_language (ASM_MASM)
endif()
################ runtime settings ################

1
samples/inst-context/CMakeLists.txt
View File

@ -9,7 +9,6 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
project (inst-context)
else()
project (inst-context C ASM)
enable_language (ASM_MASM)
endif()
################ runtime settings ################

1
samples/ref-types/CMakeLists.txt
View File

@ -9,7 +9,6 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
project(ref-types)
else()
project (ref-types C ASM)
enable_language (ASM_MASM)
endif()
################ runtime settings ################

1
samples/wasm-c-api/CMakeLists.txt
View File

@ -9,7 +9,6 @@ if (NOT WAMR_BUILD_PLATFORM STREQUAL "windows")
project(c-api)
else()
project (c-api C ASM)
enable_language (ASM_MASM)
endif()
if(NOT CMAKE_BUILD_TYPE)