X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=a1d63365baa26071684a23eb3766a957c5458f2f;hb=d51bb08a1aedb5b20f0a73d101942825ceac5ef3;hp=11da9644cefb200b1b3ccf59e10b8cc287e875f2;hpb=4ee722a52cb0fb56260ccd3962537e5c772800e0;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 11da9644..a1d63365 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,9 @@ CXXFLAGS += $(CFLAGS) #DRC_DBG = 1 #PCNT = 1 +# Suppress minor warnings for dependencies +deps/%: CFLAGS += -Wno-unused -Wno-unused-function + all: config.mak target_ plugins_ ifndef NO_CONFIG_MAK @@ -45,29 +48,35 @@ CFLAGS += -DPCNT endif # core -OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \ - libpcsxcore/decode_xa.o libpcsxcore/disr3000a.o libpcsxcore/mdec.o \ +OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/database.o \ + libpcsxcore/decode_xa.o libpcsxcore/mdec.o \ libpcsxcore/misc.o libpcsxcore/plugins.o libpcsxcore/ppf.o libpcsxcore/psxbios.o \ libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o libpcsxcore/psxhle.o \ libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \ - libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o + libpcsxcore/sio.o libpcsxcore/spu.o OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o + +ifeq ($(DEBUG), 1) +OBJS += libpcsxcore/debug.o libpcsxcore/socket.o libpcsxcore/disr3000a.o +endif + 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 +CFLAGS += -Ideps/libchdr/deps/zlib-1.2.11 +OBJS += deps/libchdr/deps/zlib-1.2.11/adler32.o \ + deps/libchdr/deps/zlib-1.2.11/compress.o \ + deps/libchdr/deps/zlib-1.2.11/crc32.o \ + deps/libchdr/deps/zlib-1.2.11/deflate.o \ + deps/libchdr/deps/zlib-1.2.11/gzclose.o \ + deps/libchdr/deps/zlib-1.2.11/gzlib.o \ + deps/libchdr/deps/zlib-1.2.11/gzread.o \ + deps/libchdr/deps/zlib-1.2.11/gzwrite.o \ + deps/libchdr/deps/zlib-1.2.11/infback.o \ + deps/libchdr/deps/zlib-1.2.11/inffast.o \ + deps/libchdr/deps/zlib-1.2.11/inflate.o \ + deps/libchdr/deps/zlib-1.2.11/inftrees.o \ + deps/libchdr/deps/zlib-1.2.11/trees.o \ + deps/libchdr/deps/zlib-1.2.11/uncompr.o \ + deps/libchdr/deps/zlib-1.2.11/zutil.o endif ifeq "$(ARCH)" "arm" OBJS += libpcsxcore/gte_arm.o @@ -79,7 +88,7 @@ libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull # dynarec ifeq "$(DYNAREC)" "lightrec" -CFLAGS += -Ideps/lightning/include -Ideps/lightrec \ +CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \ -DLIGHTREC -DLIGHTREC_STATIC OBJS += libpcsxcore/lightrec/plugin.o OBJS += deps/lightning/lib/jit_disasm.o \ @@ -104,26 +113,28 @@ CFLAGS += -Ideps/mman OBJS += deps/mman/mman.o endif else ifeq "$(DYNAREC)" "ari64" -CFLAGS += -DNEW_DYNAREC -OBJS += libpcsxcore/new_dynarec/backends/psx/emu_if.o \ - libpcsxcore/new_dynarec/new_dynarec.o \ - libpcsxcore/new_dynarec/arm/linkage_arm.o \ - libpcsxcore/new_dynarec/backends/psx/pcsxmem.o -libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/arm/assem_arm.c \ - libpcsxcore/new_dynarec/backends/psx/pcsxmem_inline.c +OBJS += libpcsxcore/new_dynarec/new_dynarec.o +OBJS += libpcsxcore/new_dynarec/pcsxmem.o + ifeq "$(ARCH)" "arm" + OBJS += libpcsxcore/new_dynarec/linkage_arm.o + libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c + else ifneq (,$(findstring $(ARCH),aarch64 arm64)) + OBJS += libpcsxcore/new_dynarec/linkage_arm64.o + libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm64.c + else + $(error no dynarec support for architecture $(ARCH)) + endif else -OBJS += libpcsxcore/new_dynarec/backends/psx/emu_if.o -libpcsxcore/new_dynarec/backends/psx/emu_if.o: CFLAGS += -DDRC_DISABLE -frontend/libretro.o: CFLAGS += -DDRC_DISABLE +CFLAGS += -DDRC_DISABLE endif +OBJS += libpcsxcore/new_dynarec/emu_if.o +libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/pcsxmem_inline.c ifdef DRC_DBG -libpcsxcore/new_dynarec/backends/psx/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64 +libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64 CFLAGS += -DDRC_DBG endif -ifeq "$(DRC_CACHE_BASE)" "1" -libpcsxcore/new_dynarec/%.o: CFLAGS += -DBASE_ADDR_FIXED=1 -libpcsxcore/new_dynarec/backends/psx/%.o: CFLAGS += -DBASE_ADDR_FIXED=1 -libpcsxcore/new_dynarec/arm/%.o: CFLAGS += -DBASE_ADDR_FIXED=1 +ifeq "$(BASE_ADDR_DYNAMIC)" "1" +libpcsxcore/new_dynarec/%.o: CFLAGS += -DBASE_ADDR_DYNAMIC=1 endif # spu @@ -209,27 +220,22 @@ OBJS += plugins/cdrcimg/cdrcimg.o ifeq "$(HAVE_CHD)" "1" CFLAGS += -Ideps/libchdr/include CFLAGS += -Ideps/libchdr/include/libchdr -OBJS += deps/crypto/md5.o -OBJS += deps/crypto/sha1.o -OBJS += deps/lzma-16.04/C/Alloc.o -OBJS += deps/lzma-16.04/C/Bra86.o -OBJS += deps/lzma-16.04/C/Bra.o -OBJS += deps/lzma-16.04/C/BraIA64.o -OBJS += deps/lzma-16.04/C/CpuArch.o -OBJS += deps/lzma-16.04/C/Delta.o -OBJS += deps/lzma-16.04/C/LzFind.o -OBJS += deps/lzma-16.04/C/Lzma86Dec.o -OBJS += deps/lzma-16.04/C/Lzma86Enc.o -OBJS += deps/lzma-16.04/C/LzmaDec.o -OBJS += deps/lzma-16.04/C/LzmaEnc.o -OBJS += deps/lzma-16.04/C/LzmaLib.o -OBJS += deps/lzma-16.04/C/Sort.o +OBJS += deps/libchdr/deps/lzma-19.00/src/Alloc.o +OBJS += deps/libchdr/deps/lzma-19.00/src/Bra86.o +OBJS += deps/libchdr/deps/lzma-19.00/src/BraIA64.o +OBJS += deps/libchdr/deps/lzma-19.00/src/CpuArch.o +OBJS += deps/libchdr/deps/lzma-19.00/src/Delta.o +OBJS += deps/libchdr/deps/lzma-19.00/src/LzFind.o +OBJS += deps/libchdr/deps/lzma-19.00/src/Lzma86Dec.o +OBJS += deps/libchdr/deps/lzma-19.00/src/LzmaDec.o +OBJS += deps/libchdr/deps/lzma-19.00/src/LzmaEnc.o +OBJS += deps/libchdr/deps/lzma-19.00/src/Sort.o OBJS += deps/libchdr/src/libchdr_bitstream.o OBJS += deps/libchdr/src/libchdr_cdrom.o OBJS += deps/libchdr/src/libchdr_chd.o OBJS += deps/libchdr/src/libchdr_flac.o OBJS += deps/libchdr/src/libchdr_huffman.o -CFLAGS += -Ideps/crypto -Ideps/lzma-16.04/C +CFLAGS += -Ideps/libchdr/deps/lzma-19.00/include CFLAGS += -DHAVE_CHD -D_7ZIP_ST LDFLAGS += -lm endif @@ -295,9 +301,19 @@ CFLAGS += `pkg-config --cflags glib-2.0 libosso dbus-1 hildon-fm-2` LDFLAGS += `pkg-config --libs glib-2.0 libosso dbus-1 hildon-fm-2` endif ifeq "$(PLATFORM)" "libretro" +ifeq "$(USE_LIBRETRO_VFS)" "1" +OBJS += libretro-common/compat/compat_posix_string.o OBJS += libretro-common/compat/fopen_utf8.o OBJS += libretro-common/encodings/compat_strl.o OBJS += libretro-common/encodings/encoding_utf.o +OBJS += libretro-common/file/file_path.o +OBJS += libretro-common/streams/file_stream.o +OBJS += libretro-common/streams/file_stream_transforms.o +OBJS += libretro-common/string/stdstring.o +OBJS += libretro-common/time/rtime.o +OBJS += libretro-common/vfs/vfs_implementation.o +CFLAGS += -DUSE_LIBRETRO_VFS +endif OBJS += frontend/libretro.o CFLAGS += -Ilibretro-common/include CFLAGS += -DFRONTEND_SUPPORTS_RGB565 @@ -314,6 +330,7 @@ ifeq "$(USE_PLUGIN_LIB)" "1" OBJS += frontend/plugin_lib.o OBJS += frontend/libpicofe/linux/plat.o OBJS += frontend/libpicofe/readpng.o frontend/libpicofe/fonts.o +frontend/libpicofe/linux/plat.o: CFLAGS += -DNO_HOME_DIR ifeq "$(HAVE_NEON)" "1" OBJS += frontend/libpicofe/arm/neon_scale2x.o OBJS += frontend/libpicofe/arm/neon_eagle2x.o @@ -349,7 +366,7 @@ libpcsxcore/gte_nf.o: libpcsxcore/gte.c $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS frontend/revision.h: FORCE - @(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ + @(git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ @diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@ @rm $@_ @@ -393,7 +410,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe HEAD) +VER ?= $(shell git describe --always HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER)