HLE: Merge HLE BIOS improvements from upstream

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index 98498c8..a278519 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,6 +159,7 @@ endif
 OBJS += plugins/cdrcimg/cdrcimg.o
 
 # libchdr
+ifeq "$(HAVE_CHD)" "1"
 CFLAGS += -Ideps/libchdr
 OBJS += deps/crypto/md5.o
 OBJS += deps/crypto/sha1.o
@@ -202,14 +203,16 @@ OBJS += deps/libchdr/flac.o
 OBJS += deps/libchdr/huffman.o
 
 ifneq (,$(findstring win,$(platform)))
+  CFLAGS += -DHAVE_FSEEKO
   OBJS += deps/flac-1.3.2/src/libFLAC/windows_unicode_filenames.o
 else
   CFLAGS += -DHAVE_SYS_PARAM_H
 endif
 
 CFLAGS += -Ideps/crypto -Ideps/flac-1.3.2/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/lzma-16.04/C
-CFLAGS += -D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST
+CFLAGS += -DHAVE_CHD -D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST
 LDFLAGS += -lm
+endif
 
 # dfinput
 OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
@@ -334,13 +337,11 @@ frontend/revision.h: FORCE
 target_: $(TARGET)
 
 $(TARGET): $(OBJS)
-       @echo "** BUILDING $(TARGET) FOR PLATFORM $(PLATFORM) **"
 ifeq ($(STATIC_LINKING), 1)
        $(AR) rcs $@ $(OBJS)
 else
        $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS)
 endif
-       @echo "** BUILD SUCCESSFUL! GG NO RE **"
 
 clean: $(PLAT_CLEAN) clean_plugins
        $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h