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

a couple of fixes to get MSVC Win64 going again

Browse Source
This commit is contained in:
Brent Cook 2019-01-21 15:26:32 -06:00
parent 6c6b58f610
commit 1b2e3576e0
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

@ -273,7 +273,7 @@ if(ENABLE_ASM)
endif()
elseif(APPLE AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
set(HOST_ASM_MACOSX_X86_64 true)
elseif(MSVC AND AND "${CMAKE_GENERATOR}" MATCHES "Win64")
elseif(MSVC AND "${CMAKE_GENERATOR}" MATCHES "Win64")
set(HOST_ASM_MASM_X86_64 true)
ENABLE_LANGUAGE(ASM_MASM)
elseif(CMAKE_SYSTEM_NAME MATCHES "MINGW" AND "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")

2
crypto/CMakeLists.txt
View File

@ -147,7 +147,7 @@ if(HOST_ASM_MASM_X86_64)
add_definitions(-DWHIRLPOOL_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ)
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MASM_SRC})
set_source_files_properties(${ASM_X86_64_MASM_SRC} PROPERTIES COMPILE_FLAGS "-x assembler-with-cpp")
set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C)
endif()
if(HOST_ASM_MINGW64_X86_64)