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 #912

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update libchdr + add zstd #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4fd7c5
Update libchdr + add zstd
sonninnos Sep 25, 2024
3dcc2a4
libchdr C89 compliance
sonninnos Nov 5, 2024
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
  •  
  •  
  •  
17 changes: 14 additions & 3 deletions Makefile.common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ ZLIB_DIR := $(DEPS_DIR)/zlib-1.2.11

LIBCHDR_INCFLAGS = \
-I$(LIBZMA_DIR)/include \
-I$(DEPS_DIR)/libchdr/include
-I$(DEPS_DIR)/libchdr/include \
-I$(DEPS_DIR)/zstd/lib \

LIBCHDR_SOURCES_C = \
$(LIBZMA_DIR)/src/Alloc.c \
$(LIBZMA_DIR)/src/Bra86.c \
Expand All @@ -28,7 +30,16 @@ LIBCHDR_SOURCES_C = \
$(DEPS_DIR)/libchdr/src/libchdr_cdrom.c \
$(DEPS_DIR)/libchdr/src/libchdr_chd.c \
$(DEPS_DIR)/libchdr/src/libchdr_flac.c \
$(DEPS_DIR)/libchdr/src/libchdr_huffman.c
$(DEPS_DIR)/libchdr/src/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 \

ZLIB_INCFLAGS = -I$(ZLIB_DIR)
ZLIB_SOURCES_C = \
Expand Down Expand Up @@ -144,7 +155,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)
Expand Down
Loading