Skip to content

Commit

Permalink
Update libchdr + add zstd
Browse files Browse the repository at this point in the history
  • Loading branch information
sonninnos committed Sep 26, 2024
1 parent 7de0f0b commit 498e371
Show file tree
Hide file tree
Showing 604 changed files with 166,463 additions and 547 deletions.
2 changes: 1 addition & 1 deletion Makefile.libretro
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ else
endif

ifeq ($(HAVE_CHD), 1)
DEFINES += -DUSE_LIBCHDR -D_7ZIP_ST -DUSE_LIBRETRO_VFS
DEFINES += -DUSE_LIBCHDR -D_7ZIP_ST -DZSTD_DISABLE_ASM -DUSE_LIBRETRO_VFS
endif

ifeq ($(USE_PER_SOUND_CHANNELS_CONFIG), 1)
Expand Down
14 changes: 12 additions & 2 deletions libretro/Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ ifeq ($(HAVE_CHD), 1)
INCFLAGS += \
-I$(LIBRETRO_DEPS_DIR)/libchdr/include \
-I$(LIBRETRO_DEPS_DIR)/lzma-19.00/include \
-I$(LIBRETRO_DEPS_DIR)/zlib-1.2.11
-I$(LIBRETRO_DEPS_DIR)/zlib-1.2.11 \
-I$(LIBRETRO_DEPS_DIR)/zstd/lib
SOURCES_C += \
$(LIBRETRO_DEPS_DIR)/lzma-19.00/src/Alloc.c \
$(LIBRETRO_DEPS_DIR)/lzma-19.00/src/Bra86.c \
Expand All @@ -41,7 +42,16 @@ ifeq ($(HAVE_CHD), 1)
$(LIBRETRO_DEPS_DIR)/libchdr/src/libchdr_cdrom.c \
$(LIBRETRO_DEPS_DIR)/libchdr/src/libchdr_chd.c \
$(LIBRETRO_DEPS_DIR)/libchdr/src/libchdr_flac.c \
$(LIBRETRO_DEPS_DIR)/libchdr/src/libchdr_huffman.c
$(LIBRETRO_DEPS_DIR)/libchdr/src/libchdr_huffman.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/common/entropy_common.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/common/error_private.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/common/fse_decompress.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/common/zstd_common.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/common/xxhash.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/decompress/huf_decompress.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/decompress/zstd_ddict.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/decompress/zstd_decompress.c \
$(LIBRETRO_DEPS_DIR)/zstd/lib/decompress/zstd_decompress_block.c
endif

SOURCES_C += $(foreach dir,$(GENPLUS_SRC_DIR),$(wildcard $(dir)/*.c))
Expand Down
Loading

0 comments on commit 498e371

Please sign in to comment.