X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=f293903af69c519c10d0fdeab4d2540f0edbcc6d;hb=e2fb1389dc12376acb84e4993ed3b08760257252;hp=470b9e8937aaefdcf617b3cafd2efe9179166a27;hpb=327c17277c9476812a30c2edb23f7f57b19a4d68;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 470b9e89..f293903a 100644 --- a/Makefile +++ b/Makefile @@ -12,9 +12,13 @@ else CFLAGS += -O2 -DNDEBUG endif endif +ifeq ($(DEBUG_ASAN), 1) +CFLAGS += -fsanitize=address +endif CFLAGS += -DP_HAVE_MMAP=$(if $(NO_MMAP),0,1) \ -DP_HAVE_PTHREAD=$(if $(NO_PTHREAD),0,1) \ - -DP_HAVE_POSIX_MEMALIGN=$(if $(NO_POSIX_MEMALIGN),0,1) + -DP_HAVE_POSIX_MEMALIGN=$(if $(NO_POSIX_MEMALIGN),0,1) \ + -DDISABLE_MEM_LUTS=0 CXXFLAGS += $(CFLAGS) #DRC_DBG = 1 #PCNT = 1 @@ -44,6 +48,9 @@ endif CC_LINK ?= $(CC) CC_AS ?= $(CC) LDFLAGS += $(MAIN_LDFLAGS) +ifeq ($(DEBUG_ASAN), 1) +LDFLAGS += -static-libasan +endif EXTRA_LDFLAGS ?= -Wl,-Map=$@.map LDLIBS += $(MAIN_LDLIBS) ifdef PCNT @@ -54,9 +61,10 @@ endif 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/spu.o + libpcsxcore/psxcommon.o libpcsxcore/psxcounters.o libpcsxcore/psxdma.o \ + libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o \ + libpcsxcore/psxevents.o libpcsxcore/r3000a.o \ + libpcsxcore/sio.o libpcsxcore/spu.o libpcsxcore/gpu.o OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o ifeq ($(DEBUG), 1) @@ -64,22 +72,23 @@ ifeq ($(DEBUG), 1) endif ifeq ($(WANT_ZLIB),1) -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 +CFLAGS += -Ideps/libchdr/deps/zlib-1.2.13 +OBJS += deps/libchdr/deps/zlib-1.2.13/adler32.o \ + deps/libchdr/deps/zlib-1.2.13/compress.o \ + deps/libchdr/deps/zlib-1.2.13/crc32.o \ + deps/libchdr/deps/zlib-1.2.13/deflate.o \ + deps/libchdr/deps/zlib-1.2.13/gzclose.o \ + deps/libchdr/deps/zlib-1.2.13/gzlib.o \ + deps/libchdr/deps/zlib-1.2.13/gzread.o \ + deps/libchdr/deps/zlib-1.2.13/gzwrite.o \ + deps/libchdr/deps/zlib-1.2.13/infback.o \ + deps/libchdr/deps/zlib-1.2.13/inffast.o \ + deps/libchdr/deps/zlib-1.2.13/inflate.o \ + deps/libchdr/deps/zlib-1.2.13/inftrees.o \ + deps/libchdr/deps/zlib-1.2.13/trees.o \ + deps/libchdr/deps/zlib-1.2.13/uncompr.o \ + deps/libchdr/deps/zlib-1.2.13/zutil.o +deps/libchdr/deps/zlib-1.2.13/%.o: CFLAGS += -DHAVE_UNISTD_H endif ifeq "$(ARCH)" "arm" OBJS += libpcsxcore/gte_arm.o @@ -110,7 +119,8 @@ OBJS += deps/lightrec/recompiler.o \ deps/lightrec/reaper.o endif OBJS += deps/lightrec/tlsf/tlsf.o -OBJS += libpcsxcore/lightrec/plugin.o +OBJS += libpcsxcore/lightrec/plugin.o \ + libpcsxcore/lightrec/internals.o OBJS += deps/lightning/lib/jit_disasm.o \ deps/lightning/lib/jit_memory.o \ deps/lightning/lib/jit_names.o \ @@ -128,6 +138,8 @@ OBJS += deps/lightning/lib/jit_disasm.o \ deps/lightrec/optimizer.o \ deps/lightrec/regcache.o deps/lightning/%.o: CFLAGS += -DHAVE_MMAP=P_HAVE_MMAP +deps/lightning/%: CFLAGS += -w +deps/lightrec/%: CFLAGS += -w libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE ifeq ($(MMAP_WIN32),1) CFLAGS += -Iinclude/mman -I deps/mman @@ -148,7 +160,7 @@ OBJS += libpcsxcore/new_dynarec/pcsxmem.o else CFLAGS += -DDRC_DISABLE endif -OBJS += libpcsxcore/new_dynarec/emu_if.o libpcsxcore/new_dynarec/events.o +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/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64 @@ -168,7 +180,7 @@ ifeq "$(ARCH)" "arm" OBJS += plugins/dfsound/arm_utils.o endif ifeq "$(HAVE_C64_TOOLS)" "1" -plugins/dfsound/spu.o: CFLAGS += -DC64X_DSP +plugins/dfsound/%.o: CFLAGS += -DC64X_DSP -DWANT_THREAD_CODE plugins/dfsound/spu.o: plugins/dfsound/spu_c64x.c frontend/menu.o: CFLAGS += -DC64X_DSP endif @@ -264,11 +276,6 @@ CFLAGS += -DHAVE_CHD -D_7ZIP_ST LDFLAGS += -lm endif -# dfinput -ifneq "$(PLATFORM)" "libretro" -OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o -endif - # frontend/gui OBJS += frontend/cspace.o ifeq "$(HAVE_NEON_ASM)" "1" @@ -307,6 +314,8 @@ frontend/main.o frontend/menu.o: CFLAGS += -include frontend/pandora/ui_feat.h frontend/libpicofe/linux/plat.o: CFLAGS += -DPANDORA USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 +CFLAGS += -gdwarf-3 -ffunction-sections -fdata-sections +LDFLAGS += -Wl,--gc-sections endif ifeq "$(PLATFORM)" "caanoo" OBJS += frontend/libpicofe/gp2x/in_gp2x.o frontend/warm/warm.o @@ -327,17 +336,27 @@ 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" +ifneq "$(HAVE_PHYSICAL_CDROM)$(USE_LIBRETRO_VFS)" "00" +OBJS += deps/libretro-common/compat/compat_strl.o +OBJS += deps/libretro-common/file/file_path.o +OBJS += deps/libretro-common/string/stdstring.o +OBJS += deps/libretro-common/vfs/vfs_implementation.o +endif +ifeq "$(HAVE_PHYSICAL_CDROM)" "1" +OBJS += frontend/libretro-cdrom.o +OBJS += deps/libretro-common/lists/string_list.o +OBJS += deps/libretro-common/memmap/memalign.o +OBJS += deps/libretro-common/rthreads/rthreads.o +OBJS += deps/libretro-common/vfs/vfs_implementation_cdrom.o +CFLAGS += -DHAVE_CDROM +endif ifeq "$(USE_LIBRETRO_VFS)" "1" OBJS += deps/libretro-common/compat/compat_posix_string.o OBJS += deps/libretro-common/compat/fopen_utf8.o -OBJS += deps/libretro-common/compat/compat_strl.o OBJS += deps/libretro-common/encodings/encoding_utf.o -OBJS += deps/libretro-common/file/file_path.o OBJS += deps/libretro-common/streams/file_stream.o OBJS += deps/libretro-common/streams/file_stream_transforms.o -OBJS += deps/libretro-common/string/stdstring.o OBJS += deps/libretro-common/time/rtime.o -OBJS += deps/libretro-common/vfs/vfs_implementation.o CFLAGS += -DUSE_LIBRETRO_VFS endif OBJS += frontend/libretro.o @@ -378,7 +397,7 @@ endif # misc OBJS += frontend/main.o frontend/plugin.o - +frontend/main.o: CFLAGS += -DBUILTIN_GPU=$(BUILTIN_GPU) frontend/menu.o frontend/main.o: frontend/revision.h frontend/plat_sdl.o frontend/libretro.o: frontend/revision.h @@ -411,7 +430,7 @@ $(TARGET): $(OBJS) ifeq ($(STATIC_LINKING), 1) $(AR) rcs $@ $(OBJS) else - $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS) + $(CC_LINK) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS) endif clean: $(PLAT_CLEAN) clean_plugins @@ -421,10 +440,10 @@ ifneq ($(PLUGINS),) plugins_: $(PLUGINS) $(PLUGINS): - make -C $(dir $@) + $(MAKE) -C $(dir $@) clean_plugins: - make -C plugins/gpulib/ clean + $(MAKE) -C plugins/gpulib/ clean for dir in $(PLUGINS) ; do \ $(MAKE) -C $$(dirname $$dir) clean; done else