mirror of
https://github.com/aaru-dps/libaaruformat.git
synced 2025-12-16 19:24:40 +00:00
General refactor and cleanup.
This commit is contained in:
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