Skip to content

Commit e2e026f

Browse files
JoeMattclaude
andcommitted
Remove vendored libchdr, add HLE CD BIOS to build
CHD support removed — CUE/BIN and CDI formats are sufficient. Add jagcd_hle.c to the source list for HLE CD boot path. Co-Authored-By: Claude Opus 4.6 <[email protected]>
1 parent 83b2374 commit e2e026f

1 file changed

Lines changed: 2 additions & 29 deletions

File tree

Makefile.common

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
LIBRETRO_COMM_DIR = $(CORE_DIR)/libretro-common
2-
LIBCHDR_DIR = $(CORE_DIR)/deps/libchdr
32

43
INCFLAGS := -I$(CORE_DIR) \
54
-I$(CORE_DIR)/src \
@@ -10,13 +9,6 @@ ifneq (,$(findstring msvc2003,$(platform)))
109
INCFLAGS += -I$(LIBRETRO_COMM_DIR)/include/compat/msvc
1110
endif
1211

13-
# libchdr (CHD disc image support)
14-
INCFLAGS += -I$(LIBCHDR_DIR)/include \
15-
-I$(LIBCHDR_DIR)/deps/lzma-25.01/include \
16-
-I$(LIBCHDR_DIR)/deps/miniz-3.1.1 \
17-
-I$(LIBCHDR_DIR)/deps/zstd-1.5.7
18-
FLAGS += -DHAVE_CHD -DMINIZ_NO_STDIO -DWANT_SUBCODE=1 -DWANT_RAW_DATA_SECTOR=0
19-
2012
SOURCES_CXX :=
2113

2214
SOURCES_C := \
@@ -54,7 +46,8 @@ SOURCES_C := \
5446
$(CORE_DIR)/src/mmu.c \
5547
$(CORE_DIR)/src/vjag_memory.c \
5648
$(CORE_DIR)/src/universalhdr.c \
57-
$(CORE_DIR)/src/wavetable.c
49+
$(CORE_DIR)/src/wavetable.c \
50+
$(CORE_DIR)/src/jagcd_hle.c
5851

5952
# SIMD-accelerated blitter operations: select arch-specific implementation.
6053
# BLITTER_SIMD may be set explicitly to one of: scalar, sse2, neon.
@@ -132,26 +125,6 @@ endif
132125

133126
SOURCES_C += $(BLITTER_SIMD_SRC)
134127

135-
# libchdr sources
136-
SOURCES_C += \
137-
$(LIBCHDR_DIR)/src/libchdr_bitstream.c \
138-
$(LIBCHDR_DIR)/src/libchdr_cdrom.c \
139-
$(LIBCHDR_DIR)/src/libchdr_chd.c \
140-
$(LIBCHDR_DIR)/src/libchdr_codec_cdfl.c \
141-
$(LIBCHDR_DIR)/src/libchdr_codec_cdlz.c \
142-
$(LIBCHDR_DIR)/src/libchdr_codec_cdzl.c \
143-
$(LIBCHDR_DIR)/src/libchdr_codec_cdzs.c \
144-
$(LIBCHDR_DIR)/src/libchdr_codec_flac.c \
145-
$(LIBCHDR_DIR)/src/libchdr_codec_huff.c \
146-
$(LIBCHDR_DIR)/src/libchdr_codec_lzma.c \
147-
$(LIBCHDR_DIR)/src/libchdr_codec_zlib.c \
148-
$(LIBCHDR_DIR)/src/libchdr_codec_zstd.c \
149-
$(LIBCHDR_DIR)/src/libchdr_flac.c \
150-
$(LIBCHDR_DIR)/src/libchdr_huffman.c \
151-
$(LIBCHDR_DIR)/deps/lzma-25.01/src/LzmaDec.c \
152-
$(LIBCHDR_DIR)/deps/miniz-3.1.1/miniz.c \
153-
$(LIBCHDR_DIR)/deps/zstd-1.5.7/zstddeclib.c
154-
155128
ifneq ($(STATIC_LINKING), 1)
156129
SOURCES_C += \
157130
$(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.c \

0 commit comments

Comments
 (0)