mirror of https://github.com/inolen/redream.git
update to latest libchdr
This commit is contained in:
Anthony Pesch
parent
a76da4b5a3
commit
9280b9ffa8
|
|
@ -19,7 +19,7 @@ list(APPEND CHDR_LIBS crypto-static)
|
|||
set(FLAC_SOURCES
|
||||
deps/flac-1.3.2/src/libFLAC/bitmath.c
|
||||
deps/flac-1.3.2/src/libFLAC/bitreader.c
|
||||
deps/flac-1.3.2/src/libFLAC/bitwriter.c
|
||||
#deps/flac-1.3.2/src/libFLAC/bitwriter.c
|
||||
deps/flac-1.3.2/src/libFLAC/cpu.c
|
||||
deps/flac-1.3.2/src/libFLAC/crc.c
|
||||
deps/flac-1.3.2/src/libFLAC/fixed.c
|
||||
|
|
@ -41,67 +41,72 @@ set(FLAC_SOURCES
|
|||
#deps/flac-1.3.2/src/libFLAC/ogg_helper.c
|
||||
#deps/flac-1.3.2/src/libFLAC/ogg_mapping.c
|
||||
deps/flac-1.3.2/src/libFLAC/stream_decoder.c
|
||||
deps/flac-1.3.2/src/libFLAC/stream_encoder.c
|
||||
deps/flac-1.3.2/src/libFLAC/stream_encoder_framing.c
|
||||
deps/flac-1.3.2/src/libFLAC/stream_encoder_intrin_avx2.c
|
||||
deps/flac-1.3.2/src/libFLAC/stream_encoder_intrin_sse2.c
|
||||
deps/flac-1.3.2/src/libFLAC/stream_encoder_intrin_ssse3.c
|
||||
#deps/flac-1.3.2/src/libFLAC/stream_encoder.c
|
||||
#deps/flac-1.3.2/src/libFLAC/stream_encoder_framing.c
|
||||
#deps/flac-1.3.2/src/libFLAC/stream_encoder_intrin_avx2.c
|
||||
#deps/flac-1.3.2/src/libFLAC/stream_encoder_intrin_sse2.c
|
||||
#deps/flac-1.3.2/src/libFLAC/stream_encoder_intrin_ssse3.c
|
||||
deps/flac-1.3.2/src/libFLAC/window.c)
|
||||
if(WIN32)
|
||||
list(APPEND FLAC_SOURCES deps/flac-1.3.2/src/libFLAC/windows_unicode_filenames.c)
|
||||
endif()
|
||||
|
||||
if(APPLE)
|
||||
list(APPEND FLAC_DEFS HAVE_SYS_PARAM_H)
|
||||
endif()
|
||||
|
||||
add_library(flac-static STATIC ${FLAC_SOURCES})
|
||||
target_include_directories(flac-static PUBLIC deps/flac-1.3.2/include deps/flac-1.3.2/src/libFLAC/include)
|
||||
target_compile_definitions(flac-static PRIVATE PACKAGE_VERSION="1.3.2" FLAC__HAS_OGG=0 FLAC__NO_DLL HAVE_LROUND HAVE_STDINT_H HAVE_STDLIB_H)
|
||||
target_compile_definitions(flac-static PRIVATE PACKAGE_VERSION="1.3.2" FLAC__HAS_OGG=0 FLAC__NO_DLL HAVE_LROUND HAVE_STDINT_H HAVE_STDLIB_H ${FLAC_DEFS})
|
||||
list(APPEND CHDR_INCLUDES deps/flac-1.3.2/src/libFLAC/include)
|
||||
list(APPEND CHDR_DEFS FLAC__NO_DLL)
|
||||
list(APPEND CHDR_LIBS flac-static)
|
||||
|
||||
# lzma
|
||||
set(LZMA_SOURCES
|
||||
deps/lzma-16.04/C/7zAlloc.c
|
||||
deps/lzma-16.04/C/7zArcIn.c
|
||||
deps/lzma-16.04/C/7zBuf2.c
|
||||
deps/lzma-16.04/C/7zBuf.c
|
||||
deps/lzma-16.04/C/7zCrc.c
|
||||
deps/lzma-16.04/C/7zCrcOpt.c
|
||||
deps/lzma-16.04/C/7zDec.c
|
||||
deps/lzma-16.04/C/7zFile.c
|
||||
deps/lzma-16.04/C/7zStream.c
|
||||
deps/lzma-16.04/C/Aes.c
|
||||
deps/lzma-16.04/C/AesOpt.c
|
||||
#deps/lzma-16.04/C/7zAlloc.c
|
||||
#deps/lzma-16.04/C/7zArcIn.c
|
||||
#deps/lzma-16.04/C/7zBuf2.c
|
||||
#deps/lzma-16.04/C/7zBuf.c
|
||||
#deps/lzma-16.04/C/7zCrc.c
|
||||
#deps/lzma-16.04/C/7zCrcOpt.c
|
||||
#deps/lzma-16.04/C/7zDec.c
|
||||
#deps/lzma-16.04/C/7zFile.c
|
||||
#deps/lzma-16.04/C/7zStream.c
|
||||
#deps/lzma-16.04/C/Aes.c
|
||||
#deps/lzma-16.04/C/AesOpt.c
|
||||
deps/lzma-16.04/C/Alloc.c
|
||||
deps/lzma-16.04/C/Bcj2.c
|
||||
#deps/lzma-16.04/C/Bcj2.c
|
||||
#deps/lzma-16.04/C/Bcj2Enc.c
|
||||
deps/lzma-16.04/C/Bra86.c
|
||||
deps/lzma-16.04/C/Bra.c
|
||||
deps/lzma-16.04/C/BraIA64.c
|
||||
deps/lzma-16.04/C/CpuArch.c
|
||||
deps/lzma-16.04/C/Delta.c
|
||||
deps/lzma-16.04/C/DllSecur.c
|
||||
#deps/lzma-16.04/C/DllSecur.c
|
||||
deps/lzma-16.04/C/LzFind.c
|
||||
#deps/lzma-16.04/C/LzFindMt.c
|
||||
deps/lzma-16.04/C/Lzma2Dec.c
|
||||
deps/lzma-16.04/C/Lzma2Enc.c
|
||||
#deps/lzma-16.04/C/Lzma2Dec.c
|
||||
#deps/lzma-16.04/C/Lzma2Enc.c
|
||||
deps/lzma-16.04/C/Lzma86Dec.c
|
||||
deps/lzma-16.04/C/Lzma86Enc.c
|
||||
deps/lzma-16.04/C/LzmaDec.c
|
||||
deps/lzma-16.04/C/LzmaEnc.c
|
||||
deps/lzma-16.04/C/LzmaLib.c
|
||||
#deps/lzma-16.04/C/MtCoder.c
|
||||
deps/lzma-16.04/C/Ppmd7.c
|
||||
deps/lzma-16.04/C/Ppmd7Dec.c
|
||||
deps/lzma-16.04/C/Ppmd7Enc.c
|
||||
deps/lzma-16.04/C/Sha256.c
|
||||
#deps/lzma-16.04/C/Ppmd7.c
|
||||
#deps/lzma-16.04/C/Ppmd7Dec.c
|
||||
#deps/lzma-16.04/C/Ppmd7Enc.c
|
||||
#deps/lzma-16.04/C/Sha256.c
|
||||
deps/lzma-16.04/C/Sort.c
|
||||
#deps/lzma-16.04/C/Threads.c
|
||||
deps/lzma-16.04/C/Xz.c
|
||||
deps/lzma-16.04/C/XzCrc64.c
|
||||
deps/lzma-16.04/C/XzCrc64Opt.c
|
||||
deps/lzma-16.04/C/XzDec.c
|
||||
deps/lzma-16.04/C/XzEnc.c
|
||||
deps/lzma-16.04/C/XzIn.c)
|
||||
#deps/lzma-16.04/C/Xz.c
|
||||
#deps/lzma-16.04/C/XzCrc64.c
|
||||
#deps/lzma-16.04/C/XzCrc64Opt.c
|
||||
#deps/lzma-16.04/C/XzDec.c
|
||||
#deps/lzma-16.04/C/XzEnc.c
|
||||
#deps/lzma-16.04/C/XzIn.c
|
||||
)
|
||||
|
||||
add_library(lzma-static STATIC ${LZMA_SOURCES})
|
||||
target_compile_options(lzma-static PRIVATE -D_7ZIP_ST)
|
||||
|
|
|
|||
|
|
@ -742,6 +742,8 @@ chd_error cdfl_codec_init(void *codec, uint32_t hunkbytes)
|
|||
else if (zerr != Z_OK)
|
||||
return CHDERR_CODEC_ERROR;
|
||||
|
||||
// flac decoder init
|
||||
flac_decoder_init(&cdfl->decoder);
|
||||
return CHDERR_NONE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,10 @@
|
|||
#ifndef __CHD_H__
|
||||
#define __CHD_H__
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "coretypes.h"
|
||||
|
||||
|
||||
|
|
@ -388,5 +392,8 @@ chd_error chd_codec_config(chd_file *chd, int param, void *config);
|
|||
/* return a string description of a codec */
|
||||
const char *chd_get_codec_name(UINT32 codec);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __CHD_H__ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue