GPU unai update

[pcsx_rearmed.git] / Makefile

diff --git a/Makefile b/Makefile
index 46539c5..89eba31 100644 (file)
--- 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
@@ -62,8 +78,8 @@ libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull
 
 # dynarec
 ifeq "$(USE_DYNAREC)" "1"
-OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o
-OBJS += libpcsxcore/new_dynarec/pcsxmem.o
+OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/arm/linkage_arm.o
+OBJS += libpcsxcore/new_dynarec/backends/psx/pcsxmem.o
 else
 libpcsxcore/new_dynarec/backends/psx/emu_if.o: CFLAGS += -DDRC_DISABLE
 frontend/libretro.o: CFLAGS += -DDRC_DISABLE
@@ -258,16 +274,19 @@ frontend/revision.h: FORCE
 %.o: %.cpp
        $(CXX) $(CXXFLAGS) -c -o $@ $<
 
-
+%.o: %.c
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 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