From d28150f7f75a53b0410fcd2d6355a4be782c4c3b Mon Sep 17 00:00:00 2001
From: Ryan 'Swingflip' Hamlin
Date: Fri, 12 Oct 2018 14:15:33 +0100
Subject: Adjustments into correct position. Added some echos.

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2a6be72..89ab0aa 100644
--- a/Makefile
+++ b/Makefile
@@ -263,11 +263,13 @@ 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
-- 
cgit v1.2.3


From 7795edd6c683a5b82701cfa825304ac48bf79fef Mon Sep 17 00:00:00 2001
From: Jean-André Santoni
Date: Sun, 13 Jan 2019 11:12:32 +0700
Subject: Embed zlib

---
 Makefile | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 89ab0aa..89eba31 100644
--- a/Makefile
+++ b/Makefile
@@ -52,6 +52,22 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore
 	libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \
 	libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o
 OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o
+ifeq ($(WANT_ZLIB),1)
+OBJS += deps/zlib/adler32.o \
+        deps/zlib/compress.o \
+        deps/zlib/crc32.o \
+        deps/zlib/deflate.o \
+        deps/zlib/gzclose.o \
+        deps/zlib/gzlib.o \
+        deps/zlib/gzread.o \
+        deps/zlib/gzwrite.o \
+        deps/zlib/inffast.o \
+        deps/zlib/inflate.o \
+        deps/zlib/inftrees.o \
+        deps/zlib/trees.o \
+        deps/zlib/uncompr.o \
+        deps/zlib/zutil.o
+endif
 ifeq "$(ARCH)" "arm"
 OBJS += libpcsxcore/gte_arm.o
 endif
@@ -258,7 +274,8 @@ frontend/revision.h: FORCE
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
 
-
+%.o: %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 target_: $(TARGET)
 
-- 
cgit v1.2.3