Merge pull request #10 from SachinVin/mac
Revert "Explicitly set assembly files to ASM lang"
This commit is contained in:
commit
4ce55f8047
@ -19,7 +19,7 @@ if(HOST_ASM_ELF_ARMV4)
|
||||
add_definitions(-DSHA256_ASM)
|
||||
add_definitions(-DSHA512_ASM)
|
||||
add_definitions(-DOPENSSL_CPUID_OBJ)
|
||||
set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE ASM)
|
||||
set_property(SOURCE ${ASM_ARMV4_ELF_SRC} PROPERTY LANGUAGE C)
|
||||
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC})
|
||||
endif()
|
||||
|
||||
@ -62,7 +62,7 @@ if(HOST_ASM_ELF_X86_64)
|
||||
add_definitions(-DWHIRLPOOL_ASM)
|
||||
add_definitions(-DOPENSSL_CPUID_OBJ)
|
||||
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_ELF_SRC})
|
||||
set_property(SOURCE ${ASM_X86_64_ELF_SRC} PROPERTY LANGUAGE ASM)
|
||||
set_property(SOURCE ${ASM_X86_64_ELF_SRC} PROPERTY LANGUAGE C)
|
||||
endif()
|
||||
|
||||
if(HOST_ASM_MACOSX_X86_64)
|
||||
@ -104,7 +104,7 @@ if(HOST_ASM_MACOSX_X86_64)
|
||||
add_definitions(-DWHIRLPOOL_ASM)
|
||||
add_definitions(-DOPENSSL_CPUID_OBJ)
|
||||
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MACOSX_SRC})
|
||||
set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY LANGUAGE ASM)
|
||||
set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY LANGUAGE C)
|
||||
set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
|
||||
endif()
|
||||
|
||||
@ -189,7 +189,7 @@ if(HOST_ASM_MINGW64_X86_64)
|
||||
add_definitions(-DWHIRLPOOL_ASM)
|
||||
add_definitions(-DOPENSSL_CPUID_OBJ)
|
||||
set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_X86_64_MINGW64_SRC})
|
||||
set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE ASM)
|
||||
set_property(SOURCE ${ASM_X86_64_MINGW64_SRC} PROPERTY LANGUAGE C)
|
||||
endif()
|
||||
|
||||
if((NOT HOST_ASM_ELF_X86_64) AND
|
||||
|
Loading…
x
Reference in New Issue
Block a user