Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libchdr + add zstd #361

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update libchdr + add zstd #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion Makefile.libretro
View file
Open in desktop
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
View file
Open in desktop
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