X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=57fee2fc2623c8af7e17dd21c073aa4f4abc590a;hb=4ec65cf9e9d59e5edc5e86a58000e14060fe6b18;hp=cf2ea88659783f2375e502aa2d8bf739102c7828;hpb=78bb116f38e967174ce6255a51c9d19805e8fcb2;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index cf2ea886..57fee2fc 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,13 @@ else CFLAGS += -O2 -DNDEBUG endif endif -CFLAGS += -DHAVE_MMAP=$(if $(NO_MMAP),0,1) \ - -DHAVE_PTHREAD=$(if $(NO_PTHREAD),0,1) +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) \ + -DDISABLE_MEM_LUTS=0 CXXFLAGS += $(CFLAGS) #DRC_DBG = 1 #PCNT = 1 @@ -43,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 @@ -53,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) @@ -63,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 @@ -93,12 +103,16 @@ ifeq "$(DYNAREC)" "lightrec" CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \ -DLIGHTREC -DLIGHTREC_STATIC LIGHTREC_CUSTOM_MAP ?= 0 +LIGHTREC_CUSTOM_MAP_OBJ ?= libpcsxcore/lightrec/mem.o LIGHTREC_THREADED_COMPILER ?= 0 CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) \ -DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER) ifeq ($(LIGHTREC_CUSTOM_MAP),1) LDLIBS += -lrt -OBJS += libpcsxcore/lightrec/mem.o +OBJS += $(LIGHTREC_CUSTOM_MAP_OBJ) +endif +ifeq ($(NEED_SYSCONF),1) +OBJS += libpcsxcore/lightrec/sysconf.o endif ifeq ($(LIGHTREC_THREADED_COMPILER),1) OBJS += deps/lightrec/recompiler.o \ @@ -122,6 +136,9 @@ OBJS += deps/lightning/lib/jit_disasm.o \ deps/lightrec/memmanager.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 @@ -142,7 +159,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 @@ -258,11 +275,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" @@ -324,7 +336,7 @@ ifeq "$(PLATFORM)" "libretro" 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/encodings/compat_strl.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 @@ -372,7 +384,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 @@ -405,7 +417,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 @@ -415,10 +427,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