always enable chd support

diff --git a/Makefile b/Makefile
index 7616cac..fa5d279 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,7 +149,7 @@ endif
 
 # cdrcimg
 OBJS += plugins/cdrcimg/cdrcimg.o
-ifeq "$(CHD_SUPPORT)" "1"
+#ifeq "$(CHD_SUPPORT)" "1"
 OBJS += libchdr/src/libchdr_bitstream.o
 OBJS += libchdr/src/libchdr_cdrom.o
 OBJS += libchdr/src/libchdr_chd.o
@@ -157,8 +157,11 @@ OBJS += libchdr/src/libchdr_flac.o
 OBJS += libchdr/src/libchdr_huffman.o
 OBJS += libchdr/deps/lzma-19.00/src/Alloc.o libchdr/deps/lzma-19.00/src/Bra86.o libchdr/deps/lzma-19.00/src/BraIA64.o libchdr/deps/lzma-19.00/src/CpuArch.o libchdr/deps/lzma-19.00/src/Delta.o
 OBJS += libchdr/deps/lzma-19.00/src/LzFind.o libchdr/deps/lzma-19.00/src/Lzma86Dec.o libchdr/deps/lzma-19.00/src/LzmaDec.o libchdr/deps/lzma-19.00/src/LzmaEnc.o libchdr/deps/lzma-19.00/src/Sort.o
-CFLAGS += -DHAVE_CHD -D_7ZIP_ST -Ilibchdr/include/libchdr -Ilibchdr/include/dr_libs -Ilibchdr/include -Ilibchdr/deps/lzma-19.00/include
-endif
+CFLAGS += -DHAVE_CHD -Ilibchdr/include
+libpcsxcore/cdriso.o: CFLAGS += -Wno-unused-function
+libchdr/src/%.o: CFLAGS += -Wno-unused -Ilibchdr/deps/lzma-19.00/include
+libchdr/deps/lzma-19.00/src/%.o: CFLAGS += -Wno-unused -D_7ZIP_ST -Ilibchdr/deps/lzma-19.00/include
+#endif
 
 # dfinput
 OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o

diff --git a/libchdr b/libchdr
index 15ff8d6..a03e693 160000 (submodule)
--- a/libchdr
+++ b/libchdr
@@ -1 +1 @@
-Subproject commit 15ff8d67554f8651f4c971f4d42176214b96ce7b
+Subproject commit a03e69319164f69d781ab8e453f8cf407387bd13

diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index e6247bb..fc29099 100644 (file)
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -40,7 +40,7 @@
 #include <zlib.h>
 
 #ifdef HAVE_CHD
-#include "chd.h"
+#include "libchdr/chd.h"
 #endif
 
 #define OFF_T_MSB ((off_t)1 << (sizeof(off_t) * 8 - 1))