aaru-dps/Aaru.Compression.Native
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Compression.Native.git synced 2025-12-16 19:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable nasm files in FLAC as they're not linking properly.

Browse Source
This commit is contained in:
Natalia Portillo
2022-12-02 11:54:42 +00:00
parent aa350e110c
commit c15b07fdc6
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
3rdparty/flac.cmake vendored
View File

@@ -91,12 +91,13 @@ if(FLAC__CPU_X86_64 OR FLAC__CPU_IA32)
option(WITH_AVX "Enable AVX, AVX2 optimizations" ON) option(WITH_AVX "Enable AVX, AVX2 optimizations" ON)
endif() endif()
include(CheckLanguage) # TODO: Fix linking
check_language(ASM_NASM) #include(CheckLanguage)
if(CMAKE_ASM_NASM_COMPILER) #check_language(ASM_NASM)
enable_language(ASM_NASM) #if(CMAKE_ASM_NASM_COMPILER)
add_definitions(-DFLAC__HAS_NASM) # enable_language(ASM_NASM)
endif() # add_definitions(-DFLAC__HAS_NASM)
#endif()
if(NOT WITH_ASM) if(NOT WITH_ASM)
add_definitions(-DFLAC__NO_ASM) add_definitions(-DFLAC__NO_ASM)
@@ -104,7 +105,7 @@ endif()
if(FLAC__CPU_IA32) if(FLAC__CPU_IA32)
if(WITH_ASM AND CMAKE_ASM_NASM_COMPILER) if(WITH_ASM AND CMAKE_ASM_NASM_COMPILER)
add_subdirectory(ia32) add_subdirectory(3rdparty/flac/src/libFLAC/ia32)
endif() endif()
option(WITH_SSE "Enable SSE2 optimizations" ON) option(WITH_SSE "Enable SSE2 optimizations" ON)