X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=83f7799bc42f8e50f8fb4fb58bffe6555ae8b1cc;hb=588bf7918460109815d5cc505ada4334a4c5a791;hp=89ab0aa1c726fa7bee18cd272d81a8931d0c45ef;hpb=2a205b97efccd649f2a5d64efff0f9e8237e6a31;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 89ab0aa1..83f7799b 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,23 @@ 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) +CFLAGS += -Ideps/zlib +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 +275,8 @@ frontend/revision.h: FORCE %.o: %.cpp $(CXX) $(CXXFLAGS) -c -o $@ $< - +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< target_: $(TARGET)