mirror of
https://github.com/aaru-dps/libaaruformat.git
synced 2025-12-16 11:14:39 +00:00
General refactor and cleanup.
This commit is contained in:
156
3rdparty/flac.cmake
vendored
156
3rdparty/flac.cmake
vendored
@@ -42,20 +42,20 @@ include(TestBigEndian)
|
||||
check_include_file("byteswap.h" HAVE_BYTESWAP_H)
|
||||
check_include_file("inttypes.h" HAVE_INTTYPES_H)
|
||||
check_include_file("stdint.h" HAVE_STDINT_H)
|
||||
if(MSVC)
|
||||
check_include_file("intrin.h" FLAC__HAS_X86INTRIN)
|
||||
else()
|
||||
check_include_file("x86intrin.h" FLAC__HAS_X86INTRIN)
|
||||
endif()
|
||||
if (MSVC)
|
||||
check_include_file("intrin.h" FLAC__HAS_X86INTRIN)
|
||||
else ()
|
||||
check_include_file("x86intrin.h" FLAC__HAS_X86INTRIN)
|
||||
endif ()
|
||||
|
||||
#check_function_exists(fseeko HAVE_FSEEKO)
|
||||
|
||||
check_c_source_compiles("int main() { return __builtin_bswap16 (0) ; }" HAVE_BSWAP16)
|
||||
check_c_source_compiles("int main() { return __builtin_bswap32 (0) ; }" HAVE_BSWAP32)
|
||||
|
||||
if(NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
|
||||
test_big_endian(CPU_IS_BIG_ENDIAN)
|
||||
endif()
|
||||
if (NOT "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW" OR (NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm" AND NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64"))
|
||||
test_big_endian(CPU_IS_BIG_ENDIAN)
|
||||
endif ()
|
||||
|
||||
check_c_compiler_flag(-mstackrealign HAVE_STACKREALIGN_FLAG)
|
||||
|
||||
@@ -64,11 +64,11 @@ include_directories("3rdparty/flac/include")
|
||||
include_directories("${CMAKE_CURRENT_BINARY_DIR}/3rdparty/flac")
|
||||
add_definitions(-DHAVE_CONFIG_H)
|
||||
|
||||
if(MSVC)
|
||||
add_definitions(
|
||||
-D_CRT_SECURE_NO_WARNINGS
|
||||
-D_USE_MATH_DEFINES)
|
||||
endif()
|
||||
if (MSVC)
|
||||
add_definitions(
|
||||
-D_CRT_SECURE_NO_WARNINGS
|
||||
-D_USE_MATH_DEFINES)
|
||||
endif ()
|
||||
|
||||
option(WITH_ASM "Use any assembly optimization routines" ON)
|
||||
|
||||
@@ -82,90 +82,90 @@ include(CheckCSourceCompiles)
|
||||
include(CheckCPUArch)
|
||||
|
||||
check_cpu_arch_x64(FLAC__CPU_X86_64)
|
||||
if(NOT FLAC__CPU_X86_64)
|
||||
check_cpu_arch_x86(FLAC__CPU_IA32)
|
||||
endif()
|
||||
if (NOT FLAC__CPU_X86_64)
|
||||
check_cpu_arch_x86(FLAC__CPU_IA32)
|
||||
endif ()
|
||||
|
||||
if(FLAC__CPU_X86_64 OR FLAC__CPU_IA32)
|
||||
set(FLAC__ALIGN_MALLOC_DATA 1)
|
||||
option(WITH_AVX "Enable AVX, AVX2 optimizations" ON)
|
||||
endif()
|
||||
if (FLAC__CPU_X86_64 OR FLAC__CPU_IA32)
|
||||
set(FLAC__ALIGN_MALLOC_DATA 1)
|
||||
option(WITH_AVX "Enable AVX, AVX2 optimizations" ON)
|
||||
endif ()
|
||||
|
||||
include(CheckLanguage)
|
||||
check_language(ASM_NASM)
|
||||
if(CMAKE_ASM_NASM_COMPILER)
|
||||
enable_language(ASM_NASM)
|
||||
add_definitions(-DFLAC__HAS_NASM)
|
||||
endif()
|
||||
if (CMAKE_ASM_NASM_COMPILER)
|
||||
enable_language(ASM_NASM)
|
||||
add_definitions(-DFLAC__HAS_NASM)
|
||||
endif ()
|
||||
|
||||
if(NOT WITH_ASM)
|
||||
add_definitions(-DFLAC__NO_ASM)
|
||||
endif()
|
||||
if (NOT WITH_ASM)
|
||||
add_definitions(-DFLAC__NO_ASM)
|
||||
endif ()
|
||||
|
||||
if(FLAC__CPU_IA32)
|
||||
if(WITH_ASM AND CMAKE_ASM_NASM_COMPILER)
|
||||
add_subdirectory(ia32)
|
||||
endif()
|
||||
if (FLAC__CPU_IA32)
|
||||
if (WITH_ASM AND CMAKE_ASM_NASM_COMPILER)
|
||||
add_subdirectory(ia32)
|
||||
endif ()
|
||||
|
||||
option(WITH_SSE "Enable SSE2 optimizations" ON)
|
||||
check_c_compiler_flag(-msse2 HAVE_MSSE2_FLAG)
|
||||
if(WITH_SSE)
|
||||
add_compile_options(
|
||||
$<$<BOOL:${HAVE_MSSE2_FLAG}>:-msse2>
|
||||
$<$<BOOL:${MSVC}>:/arch:SSE2>)
|
||||
endif()
|
||||
endif()
|
||||
option(WITH_SSE "Enable SSE2 optimizations" ON)
|
||||
check_c_compiler_flag(-msse2 HAVE_MSSE2_FLAG)
|
||||
if (WITH_SSE)
|
||||
add_compile_options(
|
||||
$<$<BOOL:${HAVE_MSSE2_FLAG}>:-msse2>
|
||||
$<$<BOOL:${MSVC}>:/arch:SSE2>)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
include_directories("3rdparty/flac/src/libFLAC/include")
|
||||
|
||||
target_sources(aaruformat PRIVATE
|
||||
3rdparty/flac/src/libFLAC/bitmath.c
|
||||
3rdparty/flac/src/libFLAC/bitreader.c
|
||||
3rdparty/flac/src/libFLAC/bitwriter.c
|
||||
3rdparty/flac/src/libFLAC/cpu.c
|
||||
3rdparty/flac/src/libFLAC/crc.c
|
||||
3rdparty/flac/src/libFLAC/fixed.c
|
||||
3rdparty/flac/src/libFLAC/fixed_intrin_sse2.c
|
||||
3rdparty/flac/src/libFLAC/fixed_intrin_ssse3.c
|
||||
3rdparty/flac/src/libFLAC/float.c
|
||||
3rdparty/flac/src/libFLAC/format.c
|
||||
3rdparty/flac/src/libFLAC/lpc.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_sse.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_sse2.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_sse41.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_avx2.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_vsx.c
|
||||
3rdparty/flac/src/libFLAC/md5.c
|
||||
3rdparty/flac/src/libFLAC/memory.c
|
||||
3rdparty/flac/src/libFLAC/metadata_iterators.c
|
||||
3rdparty/flac/src/libFLAC/metadata_object.c
|
||||
3rdparty/flac/src/libFLAC/stream_decoder.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_intrin_sse2.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_intrin_ssse3.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_intrin_avx2.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_framing.c
|
||||
3rdparty/flac/src/libFLAC/window.c
|
||||
$<$<BOOL:${WIN32}>:3rdparty/flac/include/share/windows_unicode_filenames.h>
|
||||
$<$<BOOL:${WIN32}>:3rdparty/flac/src/libFLAC/windows_unicode_filenames.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_decoder_aspect.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_encoder_aspect.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_helper.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_mapping.c>)
|
||||
3rdparty/flac/src/libFLAC/bitmath.c
|
||||
3rdparty/flac/src/libFLAC/bitreader.c
|
||||
3rdparty/flac/src/libFLAC/bitwriter.c
|
||||
3rdparty/flac/src/libFLAC/cpu.c
|
||||
3rdparty/flac/src/libFLAC/crc.c
|
||||
3rdparty/flac/src/libFLAC/fixed.c
|
||||
3rdparty/flac/src/libFLAC/fixed_intrin_sse2.c
|
||||
3rdparty/flac/src/libFLAC/fixed_intrin_ssse3.c
|
||||
3rdparty/flac/src/libFLAC/float.c
|
||||
3rdparty/flac/src/libFLAC/format.c
|
||||
3rdparty/flac/src/libFLAC/lpc.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_sse.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_sse2.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_sse41.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_avx2.c
|
||||
3rdparty/flac/src/libFLAC/lpc_intrin_vsx.c
|
||||
3rdparty/flac/src/libFLAC/md5.c
|
||||
3rdparty/flac/src/libFLAC/memory.c
|
||||
3rdparty/flac/src/libFLAC/metadata_iterators.c
|
||||
3rdparty/flac/src/libFLAC/metadata_object.c
|
||||
3rdparty/flac/src/libFLAC/stream_decoder.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_intrin_sse2.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_intrin_ssse3.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_intrin_avx2.c
|
||||
3rdparty/flac/src/libFLAC/stream_encoder_framing.c
|
||||
3rdparty/flac/src/libFLAC/window.c
|
||||
$<$<BOOL:${WIN32}>:3rdparty/flac/include/share/windows_unicode_filenames.h>
|
||||
$<$<BOOL:${WIN32}>:3rdparty/flac/src/libFLAC/windows_unicode_filenames.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_decoder_aspect.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_encoder_aspect.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_helper.c>
|
||||
$<$<BOOL:${OGG_FOUND}>:ogg_mapping.c>)
|
||||
|
||||
target_compile_definitions(aaruformat PUBLIC FLAC__NO_DLL)
|
||||
target_compile_definitions(aaruformat PUBLIC FLAC__NO_FILEIO)
|
||||
|
||||
# Disable fortify source when not-release or when cross-building with MingW for WoA
|
||||
if(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo OR "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
|
||||
set(DODEFINE_FORTIFY_SOURCE 0)
|
||||
endif()
|
||||
if (CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo OR "${CMAKE_C_PLATFORM_ID}" MATCHES "MinGW")
|
||||
set(DODEFINE_FORTIFY_SOURCE 0)
|
||||
endif ()
|
||||
|
||||
set_property(TARGET aaruformat PROPERTY C_VISIBILITY_PRESET hidden)
|
||||
|
||||
if(ARCHITECTURE_IS_64BIT)
|
||||
set(ENABLE_64_BIT_WORDS 1)
|
||||
endif()
|
||||
if (ARCHITECTURE_IS_64BIT)
|
||||
set(ENABLE_64_BIT_WORDS 1)
|
||||
endif ()
|
||||
|
||||
configure_file(3rdparty/flac/config.cmake.h.in 3rdparty/flac/config.h)
|
||||
|
||||
|
||||
84
3rdparty/lzma.cmake
vendored
84
3rdparty/lzma.cmake
vendored
@@ -10,27 +10,27 @@ target_compile_definitions(aaruformat PUBLIC _7ZIP_ST)
|
||||
|
||||
# All assembly for x86 and x64 disabled because it uses a custom, non GAS, non MASM, assembler
|
||||
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
set(IS_X64 1)
|
||||
target_compile_definitions(aaruformat PUBLIC IS_X64)
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
set(IS_X64 1)
|
||||
target_compile_definitions(aaruformat PUBLIC IS_X64)
|
||||
|
||||
# if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
|
||||
# set(USE_ASM 1)
|
||||
# endif()
|
||||
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
|
||||
set(IS_X86 1)
|
||||
target_compile_definitions(aaruformat PUBLIC IS_X86)
|
||||
# set(USE_ASM 1)
|
||||
elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
|
||||
set(IS_ARM64 1)
|
||||
target_compile_definitions(aaruformat PUBLIC IS_ARM64)
|
||||
set(USE_ASM 1)
|
||||
endif()
|
||||
# if(NOT "${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang")
|
||||
# set(USE_ASM 1)
|
||||
# endif()
|
||||
elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686")
|
||||
set(IS_X86 1)
|
||||
target_compile_definitions(aaruformat PUBLIC IS_X86)
|
||||
# set(USE_ASM 1)
|
||||
elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
|
||||
set(IS_ARM64 1)
|
||||
target_compile_definitions(aaruformat PUBLIC IS_ARM64)
|
||||
set(USE_ASM 1)
|
||||
endif ()
|
||||
|
||||
if("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang" OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
|
||||
set(USE_CLANG 1)
|
||||
target_compile_definitions(aaruformat PUBLIC USE_CLANG)
|
||||
endif()
|
||||
if ("${CMAKE_C_COMPILER_ID}" MATCHES "AppleClang" OR "${CMAKE_C_COMPILER_ID}" MATCHES "Clang")
|
||||
set(USE_CLANG 1)
|
||||
target_compile_definitions(aaruformat PUBLIC USE_CLANG)
|
||||
endif ()
|
||||
|
||||
#target_compile_options(lzma PUBLIC -Wall)
|
||||
#target_compile_options(lzma PUBLIC -Werror)
|
||||
@@ -38,12 +38,12 @@ endif()
|
||||
target_compile_definitions(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-DABI_LINUX>)
|
||||
|
||||
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
target_compile_options(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-elf64>)
|
||||
else()
|
||||
target_compile_options(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-elf>)
|
||||
target_compile_definitions(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-DABI_CDECL>)
|
||||
endif()
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
target_compile_options(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-elf64>)
|
||||
else ()
|
||||
target_compile_options(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-elf>)
|
||||
target_compile_definitions(aaruformat PUBLIC $<$<COMPILE_LANGUAGE:ASM>:-DABI_CDECL>)
|
||||
endif ()
|
||||
|
||||
#target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/7zAlloc.c)
|
||||
#target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/7zArcIn.c)
|
||||
@@ -98,11 +98,11 @@ target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/LzmaLib.c)
|
||||
|
||||
#target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/x86/7zCrcOpt.asm)
|
||||
|
||||
if(USE_ASM)
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
set(USE_X86_ASM 1)
|
||||
endif()
|
||||
endif()
|
||||
if (USE_ASM)
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "i686" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
set(USE_X86_ASM 1)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
#if(USE_X86_ASM)
|
||||
# target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/x86/7zCrcOpt.asm)
|
||||
@@ -118,20 +118,20 @@ endif()
|
||||
# target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/AesOpt.c)
|
||||
#endif()
|
||||
|
||||
if(USE_LZMA_DEC_ASM)
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/x86/LzmaDecOpt.asm)
|
||||
endif()
|
||||
if (USE_LZMA_DEC_ASM)
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")
|
||||
target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/x86/LzmaDecOpt.asm)
|
||||
endif ()
|
||||
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
|
||||
target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/LzmaDecOpt.S)
|
||||
# target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/7zAsm.S)
|
||||
endif()
|
||||
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
|
||||
target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/LzmaDecOpt.S)
|
||||
# target_sources(aaruformat PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/7zAsm.S)
|
||||
endif ()
|
||||
|
||||
target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/LzmaDec.c)
|
||||
else()
|
||||
target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/LzmaDec.c)
|
||||
endif()
|
||||
target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/LzmaDec.c)
|
||||
else ()
|
||||
target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/LzmaDec.c)
|
||||
endif ()
|
||||
|
||||
#target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/XzDec.c)
|
||||
#target_sources(aaruformat PRIVATE ${LZMA_C_DIRECTORY}/XzEnc.c)
|
||||
|
||||
Reference in New Issue
Block a user