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

Merge pull request #10 from SachinVin/mac

Browse Source 
Revert "Explicitly set assembly files to ASM lang"
This commit is contained in:
Schplee 2022-03-25 22:55:42 -07:00 committed by GitHub
commit 4ce55f8047
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/CMakeLists.txt
View File

@ -19,7 +19,7 @@ if(HOST_ASM_ELF_ARMV4)
add_definitions(-DSHA256_ASM) add_definitions(-DSHA256_ASM)
add_definitions(-DSHA512_ASM) add_definitions(-DSHA512_ASM)
add_definitions(-DOPENSSL_CPUID_OBJ) 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}) set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC})
endif() endif()
@ -62,7 +62,7 @@ if(HOST_ASM_ELF_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_ELF_SRC}) 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() endif()
if(HOST_ASM_MACOSX_X86_64) if(HOST_ASM_MACOSX_X86_64)
@ -104,7 +104,7 @@ if(HOST_ASM_MACOSX_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_MACOSX_SRC}) 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") set_property(SOURCE ${ASM_X86_64_MACOSX_SRC} PROPERTY XCODE_EXPLICIT_FILE_TYPE "sourcecode.asm")
endif() endif()
@ -189,7 +189,7 @@ if(HOST_ASM_MINGW64_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_MINGW64_SRC}) 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() endif()
if((NOT HOST_ASM_ELF_X86_64) AND if((NOT HOST_ASM_ELF_X86_64) AND