diff --git a/3rdparty/bzip2.cmake b/3rdparty/bzip2.cmake index 60119eb..ff3eea5 100644 --- a/3rdparty/bzip2.cmake +++ b/3rdparty/bzip2.cmake @@ -138,4 +138,5 @@ add_definitions(-DBZ_DEBUG=0) # install(FILES bzlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) #endif() -set_property(TARGET bz2_static PROPERTY C_VISIBILITY_PRESET hidden) \ No newline at end of file +set_property(TARGET bz2_static PROPERTY C_VISIBILITY_PRESET hidden) +target_compile_definitions(bz2_static PUBLIC BZ_NO_STDIO) \ No newline at end of file diff --git a/3rdparty/lzma.cmake b/3rdparty/lzma.cmake index b3e4a18..7fc37ea 100644 --- a/3rdparty/lzma.cmake +++ b/3rdparty/lzma.cmake @@ -53,26 +53,26 @@ else() target_compile_definitions(lzma PUBLIC $<$:-DABI_CDECL>) endif() -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zAlloc.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zArcIn.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zBuf.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zBuf2.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zCrc.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zDec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zFile.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zStream.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Aes.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zAlloc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zArcIn.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zBuf.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zBuf2.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zCrc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zDec.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zFile.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zStream.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Aes.c) target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Alloc.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bcj2.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bcj2Enc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bcj2.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bcj2Enc.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Blake2s.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bra.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bra86.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/BraIA64.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bra.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Bra86.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/BraIA64.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/BwtSort.c) target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/CpuArch.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Delta.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/DllSecur.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Delta.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/DllSecur.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/HuffEnc.c) target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/LzFind.c) ## ifdef MT_FILES @@ -82,26 +82,26 @@ target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/LzFind.c) ## endif # target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/LzmaEnc.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma86Dec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma86Enc.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma2Dec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma2DecMt.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma2Enc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma86Dec.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma86Enc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma2Dec.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma2DecMt.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Lzma2Enc.c) target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/LzmaLib.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/MtCoder.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/MtDec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/MtCoder.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/MtDec.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7aDec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7Dec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7Enc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7Dec.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd7Enc.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd8.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd8Dec.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Ppmd8Enc.c) #target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sha1.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sha256.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sort.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Xz.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzCrc64.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sha256.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sort.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Xz.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzCrc64.c) #target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/7zCrcOpt.asm) @@ -112,19 +112,19 @@ if(USE_ASM) endif() endif() -if(USE_X86_ASM) - target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/7zCrcOpt.asm) - target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/XzCrc64Opt.asm) - target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/AesOpt.asm) +#if(USE_X86_ASM) +# target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/7zCrcOpt.asm) +# target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/XzCrc64Opt.asm) +# target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/AesOpt.asm) # target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/Sha1Opt.asm) - target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/Sha256Opt.asm) -else() - target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zCrcOpt.c) - target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzCrc64Opt.c) +# target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/x86/Sha256Opt.asm) +#else() +# target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/7zCrcOpt.c) +# target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzCrc64Opt.c) # target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sha1Opt.c) - target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sha256Opt.c) - target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/AesOpt.c) -endif() +# target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/Sha256Opt.c) +# target_sources(lzma 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") @@ -133,7 +133,7 @@ if(USE_LZMA_DEC_ASM) if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64") target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/LzmaDecOpt.S) - target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/7zAsm.S) +# target_sources(lzma PRIVATE ${LZMA_ASM_DIRECTORY}/arm64/7zAsm.S) endif() target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/LzmaDec.c) @@ -141,8 +141,8 @@ else() target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/LzmaDec.c) endif() -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzDec.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzEnc.c) -target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzIn.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzDec.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzEnc.c) +#target_sources(lzma PRIVATE ${LZMA_C_DIRECTORY}/XzIn.c) set_property(TARGET lzma PROPERTY C_VISIBILITY_PRESET hidden) \ No newline at end of file diff --git a/3rdparty/zstd.cmake b/3rdparty/zstd.cmake index 6bfeafd..2e114fd 100644 --- a/3rdparty/zstd.cmake +++ b/3rdparty/zstd.cmake @@ -165,7 +165,7 @@ add_definitions(-DXXH_NAMESPACE=ZSTD_) #----------------------------------------------------------------------------- # Legacy support -option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" ON) +option(ZSTD_LEGACY_SUPPORT "LEGACY SUPPORT" OFF) if (ZSTD_LEGACY_SUPPORT) message(STATUS "ZSTD_LEGACY_SUPPORT defined!") diff --git a/library.c b/library.c index 32c523f..8a617b6 100644 --- a/library.c +++ b/library.c @@ -102,4 +102,7 @@ AARU_EXPORT size_t AARU_CALL AARU_zstd_encode_buffer(void* dst_buffer, int32_t compressionLevel) { return ZSTD_compress(dst_buffer, dst_size, src_buffer, src_size, compressionLevel); -} \ No newline at end of file +} + +// This is required if BZ_NO_STDIO +void bz_internal_error ( int errcode ) { } \ No newline at end of file