switch to libchdr with dr_flac

diff --git a/Makefile b/Makefile
index 6dc8f55..063ba9d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -250,16 +250,6 @@ CHDR_OBJS += $(CHDR)/src/libchdr_chd.o $(CHDR)/src/libchdr_cdrom.o
 CHDR_OBJS += $(CHDR)/src/libchdr_flac.o
 CHDR_OBJS += $(CHDR)/src/libchdr_bitstream.o $(CHDR)/src/libchdr_huffman.o
 
-# flac
-FLAC = $(CHDR)/deps/flac-1.3.3
-FLAC_OBJS += $(FLAC)/src/format.o $(FLAC)/src/lpc.o $(FLAC)/src/cpu.o
-FLAC_OBJS += $(FLAC)/src/metadata_object.o $(FLAC)/src/metadata_iterators.o
-FLAC_OBJS += $(FLAC)/src/bitmath.o $(FLAC)/src/bitreader.o $(FLAC)/src/md5.o
-FLAC_OBJS += $(FLAC)/src/memory.o $(FLAC)/src/fixed.o $(FLAC)/src/crc.o
-FLAC_OBJS += $(FLAC)/src/window.o $(FLAC)/src/stream_decoder.o
-FLAC_OBJS += $(FLAC)/src/windows_unicode_filenames.o
-$(FLAC_OBJS): CFLAGS += -DPACKAGE_VERSION=\"1.3.3\" -DFLAC__HAS_OGG=0
-$(FLAC_OBJS): CFLAGS += -DHAVE_FSEEKO -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H # ugh...
 
 # lzma
 LZMA = $(CHDR)/deps/lzma-19.00

diff --git a/pico/cd/libchdr b/pico/cd/libchdr
index 714fc3f..ff3175d 160000 (submodule)
--- a/pico/cd/libchdr
+++ b/pico/cd/libchdr
@@ -1 +1 @@
-Subproject commit 714fc3f268ebddf035a76cc883bd4543b5142a6f
+Subproject commit ff3175ddb040b1a967c665a28868b16bf5aa97dd