factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable masm compilation under windows

Browse Source
This commit is contained in:
Stephan Vedder 2019-05-15 22:50:01 +02:00 committed by Brent Cook
parent 4dabadaf4d
commit c6f8ca2bc6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -289,7 +289,7 @@ if(ENABLE_ASM)
endif() endif()
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64") elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MACOSX_X86_64 true) set(HOST_ASM_MACOSX_X86_64 true)
elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64" AND FALSE) elseif(MSVC AND "${CMAKE_SYSTEM_PROCESSOR}" MATCHES "AMD64")
# XXX Disabled for now, CMake's MASM support seems to either never # XXX Disabled for now, CMake's MASM support seems to either never
# build supply ASM or build it with the C compiler in a mode where it # build supply ASM or build it with the C compiler in a mode where it
# does not parse correctly. It might be easier to get NASM support working. # does not parse correctly. It might be easier to get NASM support working.

2
crypto/CMakeLists.txt
View File

@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64)
add_definitions(-DWHIRLPOOL_ASM) add_definitions(-DWHIRLPOOL_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ) add_definitions(-DOPENSSL_CPUID_OBJ)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC}) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE C) set_property(SOURCE ${ASM_X86_64_MASM_SRC} PROPERTY LANGUAGE ASM_MASM)
endif() endif()
if(HOST_ASM_MINGW64_X86_64) if(HOST_ASM_MINGW64_X86_64)