RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

update submodules, use lzma-19.00 with newer libchdr

Browse source 
lzma-22.01 doesn't compile cleanly with some libretro platforms
This commit is contained in:
kub 2022-12-21 12:10:24 +00:00
parent d5288c2a41
commit e1b916547d
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -295,21 +295,16 @@ endif
endif endif
ifeq (1,$(use_libchdr)) ifeq (1,$(use_libchdr))
CHDR = pico/cd/libchdr CFLAGS += -DUSE_LIBCHDR
CFLAGS += -DUSE_LIBCHDR -I$(CHDR)/include
# ouf... is there a better way to identify the include directories cmake uses?
CHDR_I = $(shell grep 'add_subdirectory.*EXCLUDE' $(CHDR)/CMakeLists.txt | sed 's/.*add_subdirectory[ ]*.//;s/EXCLUDE.*//')
# prepend includes to overload headers available in the toolchain
CFLAGS := $(patsubst %, -I$(CHDR)/%/include, $(CHDR_I)) $(CFLAGS)
# chdr # chdr
CHDR = pico/cd/libchdr
CHDR_OBJS += $(CHDR)/src/libchdr_chd.o $(CHDR)/src/libchdr_cdrom.o CHDR_OBJS += $(CHDR)/src/libchdr_chd.o $(CHDR)/src/libchdr_cdrom.o
CHDR_OBJS += $(CHDR)/src/libchdr_flac.o CHDR_OBJS += $(CHDR)/src/libchdr_flac.o
CHDR_OBJS += $(CHDR)/src/libchdr_bitstream.o $(CHDR)/src/libchdr_huffman.o CHDR_OBJS += $(CHDR)/src/libchdr_bitstream.o $(CHDR)/src/libchdr_huffman.o
# lzma - argh, what's make's way to filter CHDR_I for the string containing lzma? # lzma - use 19.00 as newer versions have compile problems with libretro platforms
LZMA = $(CHDR)/$(shell for d in $(CHDR_I); do echo $$d | grep lzma; done) LZMA = $(CHDR)/deps/lzma-19.00
LZMA_OBJS += $(LZMA)/src/CpuArch.o $(LZMA)/src/Alloc.o $(LZMA)/src/LzmaEnc.o LZMA_OBJS += $(LZMA)/src/CpuArch.o $(LZMA)/src/Alloc.o $(LZMA)/src/LzmaEnc.o
LZMA_OBJS += $(LZMA)/src/Sort.o $(LZMA)/src/LzmaDec.o $(LZMA)/src/LzFind.o LZMA_OBJS += $(LZMA)/src/Sort.o $(LZMA)/src/LzmaDec.o $(LZMA)/src/LzFind.o
LZMA_OBJS += $(LZMA)/src/Delta.o LZMA_OBJS += $(LZMA)/src/Delta.o
@ -319,6 +314,8 @@ OBJS += $(CHDR_OBJS)
ifneq ($(STATIC_LINKING), 1) ifneq ($(STATIC_LINKING), 1)
OBJS += $(LZMA_OBJS) OBJS += $(LZMA_OBJS)
endif endif
# ouf... prepend includes to overload headers available in the toolchain
CFLAGS := -I$(LZMA)/include -I$(CHDR)/include $(CFLAGS)
endif endif
ifeq "$(PLATFORM_ZLIB)" "1" ifeq "$(PLATFORM_ZLIB)" "1"