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

Jump to bottom

Update libchdr + add zstd #40

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

Update libchdr + add zstd #40

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
  •  
  •  
  •  
16 changes: 13 additions & 3 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ifeq ($(NEED_CD), 1)
endif

ifeq ($(HAVE_CHD), 1)
FLAGS += -DHAVE_CHD -D_7ZIP_ST
FLAGS += -DHAVE_CHD -D_7ZIP_ST -DZSTD_DISABLE_ASM
ifeq ($(SYSTEM_LIBCHDR), 1)
INCFLAGS += $(shell pkg-config --cflags libchdr)
LIBS += $(shell pkg-config --libs libchdr)
Expand All @@ -46,7 +46,8 @@ else
-I$(DEPS_DIR)/lzma/C \
-I$(DEPS_DIR)/libchdr \
-I$(DEPS_DIR)/libchdr/include \
-I$(DEPS_DIR)/libchdr/include/libchdr
-I$(DEPS_DIR)/libchdr/include/libchdr \
-I$(DEPS_DIR)/zstd/lib
endif
endif

Expand Down Expand Up @@ -129,7 +130,16 @@ SOURCES_C += \
$(LIBCHDR_DIR)/libchdr_cdrom.c \
$(LIBCHDR_DIR)/libchdr_chd.c \
$(LIBCHDR_DIR)/libchdr_flac.c \
$(LIBCHDR_DIR)/libchdr_huffman.c
$(LIBCHDR_DIR)/libchdr_huffman.c \
$(DEPS_DIR)/zstd/lib/common/entropy_common.c \
$(DEPS_DIR)/zstd/lib/common/error_private.c \
$(DEPS_DIR)/zstd/lib/common/fse_decompress.c \
$(DEPS_DIR)/zstd/lib/common/zstd_common.c \
$(DEPS_DIR)/zstd/lib/common/xxhash.c \
$(DEPS_DIR)/zstd/lib/decompress/huf_decompress.c \
$(DEPS_DIR)/zstd/lib/decompress/zstd_ddict.c \
$(DEPS_DIR)/zstd/lib/decompress/zstd_decompress.c \
$(DEPS_DIR)/zstd/lib/decompress/zstd_decompress_block.c
endif

SOURCES_CXX += $(CDROM_DIR)/CDAccess_CHD.cpp
Expand Down
Loading