build, fix libchd zstd support for libretro static linking
authorkub <derkub@gmail.com>
Sun, 9 Jun 2024 22:24:45 +0000 (22:24 +0000)
committerkub <derkub@gmail.com>
Fri, 14 Jun 2024 22:12:01 +0000 (00:12 +0200)
Makefile
pico/cd/libchdr

index 8352389..713cbe9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -345,9 +345,9 @@ ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress_block.o
 ZSTD_OBJS += $(ZSTD)/decompress/zstd_decompress.o
 $(ZSTD_OBJS) $(CHDR_OBJS): CFLAGS += -I$(ZSTD) -Wno-unused
 
-OBJS += $(CHDR_OBJS)
+OBJS += $(CHDR_OBJS) $(ZSTD_OBJS)
 ifneq ($(STATIC_LINKING), 1)
-OBJS += $(LZMA_OBJS) $(ZSTD_OBJS)
+OBJS += $(LZMA_OBJS)
 endif
 # ouf... prepend includes to overload headers available in the toolchain
 CFLAGS := -I$(LZMA)/include -I$(CHDR)/include $(CFLAGS)
index 0b5a86f..e62ac59 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0b5a86fe0c8b64497d7c6cbc23db72fd6fb1b982
+Subproject commit e62ac5995b1c7ef65ece35293914843b8ee57d49