From: notaz Date: Mon, 20 May 2024 23:02:19 +0000 (+0300) Subject: update libchdr X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0658995f3fcb6f79d1624b675de5320b5d8e1a;p=pcsx_rearmed.git update libchdr --- diff --git a/Makefile b/Makefile index 32cd6cf9..5b890600 100644 --- a/Makefile +++ b/Makefile @@ -172,8 +172,8 @@ OBJS += plugins/cdrcimg/cdrcimg.o # libchdr #ifeq "$(HAVE_CHD)" "1" LCHDR = deps/libchdr -LCHDR_LZMA = $(LCHDR)/deps/lzma-22.01 -LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.5/lib +LCHDR_LZMA = $(LCHDR)/deps/lzma-24.05 +LCHDR_ZSTD = $(LCHDR)/deps/zstd-1.5.6/lib OBJS += $(LCHDR)/src/libchdr_bitstream.o OBJS += $(LCHDR)/src/libchdr_cdrom.o OBJS += $(LCHDR)/src/libchdr_chd.o @@ -181,31 +181,26 @@ OBJS += $(LCHDR)/src/libchdr_flac.o OBJS += $(LCHDR)/src/libchdr_huffman.o $(LCHDR)/src/%.o: CFLAGS += -Wno-unused -std=gnu11 OBJS += $(LCHDR_LZMA)/src/Alloc.o -OBJS += $(LCHDR_LZMA)/src/Bra86.o -OBJS += $(LCHDR_LZMA)/src/BraIA64.o OBJS += $(LCHDR_LZMA)/src/CpuArch.o OBJS += $(LCHDR_LZMA)/src/Delta.o OBJS += $(LCHDR_LZMA)/src/LzFind.o -OBJS += $(LCHDR_LZMA)/src/Lzma86Dec.o OBJS += $(LCHDR_LZMA)/src/LzmaDec.o OBJS += $(LCHDR_LZMA)/src/LzmaEnc.o OBJS += $(LCHDR_LZMA)/src/Sort.o -$(LCHDR_LZMA)/src/%.o: CFLAGS += -Wno-unused -D_7ZIP_ST -I$(LCHDR_LZMA)/include +$(LCHDR_LZMA)/src/%.o: CFLAGS += -Wno-unused -DZ7_ST -I$(LCHDR_LZMA)/include $(LCHDR)/src/%.o: CFLAGS += -I$(LCHDR_LZMA)/include -OBJS += $(LCHDR_ZSTD)/common/debug.o OBJS += $(LCHDR_ZSTD)/common/entropy_common.o OBJS += $(LCHDR_ZSTD)/common/error_private.o OBJS += $(LCHDR_ZSTD)/common/fse_decompress.o -OBJS += $(LCHDR_ZSTD)/common/pool.o -OBJS += $(LCHDR_ZSTD)/common/threading.o OBJS += $(LCHDR_ZSTD)/common/xxhash.o OBJS += $(LCHDR_ZSTD)/common/zstd_common.o OBJS += $(LCHDR_ZSTD)/decompress/huf_decompress.o +OBJS += $(LCHDR_ZSTD)/decompress/huf_decompress_amd64.o OBJS += $(LCHDR_ZSTD)/decompress/zstd_ddict.o OBJS += $(LCHDR_ZSTD)/decompress/zstd_decompress_block.o OBJS += $(LCHDR_ZSTD)/decompress/zstd_decompress.o $(LCHDR_ZSTD)/common/%.o \ -$(LCHDR_ZSTD)/decompress/%.o: CFLAGS += -DZSTD_DISABLE_ASM -I$(LCHDR_ZSTD) +$(LCHDR_ZSTD)/decompress/%.o: CFLAGS += -I$(LCHDR_ZSTD) $(LCHDR)/src/%.o: CFLAGS += -I$(LCHDR_ZSTD) libpcsxcore/cdriso.o: CFLAGS += -Wno-unused-function CFLAGS += -DHAVE_CHD -I$(LCHDR)/include diff --git a/deps/libchdr b/deps/libchdr index 5c598c2d..86b27207 160000 --- a/deps/libchdr +++ b/deps/libchdr @@ -1 +1 @@ -Subproject commit 5c598c2df3a7717552a76410d79f5af01ff51b1d +Subproject commit 86b272076d542287d3f03952e7d4efe283e815bf