diff options
| author | Sakitoshi | 2019-01-23 21:51:34 -0300 |
|---|---|---|
| committer | GitHub | 2019-01-23 21:51:34 -0300 |
| commit | e424c297b7b714cf2f25582cf9b4fc30cba5599f (patch) | |
| tree | ea7e23977f5403d1c5ed3e18b27d03e53e778810 /Makefile | |
| parent | de95fedd6981b4608cb78180e3bddde7e675223c (diff) | |
| parent | c8e850f3584ba1eea367373d76d8b768a58d6d2c (diff) | |
| download | pcsx_rearmed-e424c297b7b714cf2f25582cf9b4fc30cba5599f.tar.gz pcsx_rearmed-e424c297b7b714cf2f25582cf9b4fc30cba5599f.tar.bz2 pcsx_rearmed-e424c297b7b714cf2f25582cf9b4fc30cba5599f.zip | |
Merge pull request #1 from libretro/master
catch up to libretro repo
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 20 insertions, 1 deletions
@@ -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,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 |