Skip to content

Commit 2fb25db

Browse files
committed
Update libchdr + add zstd
1 parent 7a8f808 commit 2fb25db

File tree

602 files changed

+166437
-502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

602 files changed

+166437
-502
lines changed

Makefile.common

+13-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ifeq ($(NEED_CD), 1)
3737
endif
3838

3939
ifeq ($(HAVE_CHD), 1)
40-
FLAGS += -DHAVE_CHD -D_7ZIP_ST
40+
FLAGS += -DHAVE_CHD -D_7ZIP_ST -DZSTD_DISABLE_ASM
4141
ifeq ($(SYSTEM_LIBCHDR), 1)
4242
INCFLAGS += $(shell pkg-config --cflags libchdr)
4343
LIBS += $(shell pkg-config --libs libchdr)
@@ -46,7 +46,8 @@ else
4646
-I$(DEPS_DIR)/lzma/C \
4747
-I$(DEPS_DIR)/libchdr \
4848
-I$(DEPS_DIR)/libchdr/include \
49-
-I$(DEPS_DIR)/libchdr/include/libchdr
49+
-I$(DEPS_DIR)/libchdr/include/libchdr \
50+
-I$(DEPS_DIR)/zstd/lib
5051
endif
5152
endif
5253

@@ -129,7 +130,16 @@ SOURCES_C += \
129130
$(LIBCHDR_DIR)/libchdr_cdrom.c \
130131
$(LIBCHDR_DIR)/libchdr_chd.c \
131132
$(LIBCHDR_DIR)/libchdr_flac.c \
132-
$(LIBCHDR_DIR)/libchdr_huffman.c
133+
$(LIBCHDR_DIR)/libchdr_huffman.c \
134+
$(DEPS_DIR)/zstd/lib/common/entropy_common.c \
135+
$(DEPS_DIR)/zstd/lib/common/error_private.c \
136+
$(DEPS_DIR)/zstd/lib/common/fse_decompress.c \
137+
$(DEPS_DIR)/zstd/lib/common/zstd_common.c \
138+
$(DEPS_DIR)/zstd/lib/common/xxhash.c \
139+
$(DEPS_DIR)/zstd/lib/decompress/huf_decompress.c \
140+
$(DEPS_DIR)/zstd/lib/decompress/zstd_ddict.c \
141+
$(DEPS_DIR)/zstd/lib/decompress/zstd_decompress.c \
142+
$(DEPS_DIR)/zstd/lib/decompress/zstd_decompress_block.c
133143
endif
134144

135145
SOURCES_CXX += $(CDROM_DIR)/CDAccess_CHD.cpp

0 commit comments

Comments
 (0)