X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=2f58674bae5e5014fa2012a14d720ae0a523cf93;hb=051a3d7c405e076032a804fc8b93448052eaf829;hp=0cc90ce88cec9e0caec9b3e666f94dc6f49afcc8;hpb=047899a4f30d4a11e467e6b5aa0ba4cbf94c3f6b;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 0cc90ce8..2f58674b 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,9 @@ else CFLAGS += -O2 -DNDEBUG endif 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) CXXFLAGS += $(CFLAGS) #DRC_DBG = 1 #PCNT = 1 @@ -57,26 +60,27 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore 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 +#OBJS += libpcsxcore/debug.o libpcsxcore/socket.o libpcsxcore/disr3000a.o 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 @@ -91,11 +95,20 @@ ifeq "$(DYNAREC)" "lightrec" CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \ -DLIGHTREC -DLIGHTREC_STATIC LIGHTREC_CUSTOM_MAP ?= 0 -CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) -deps/lightning/lib/%.o: CFLAGS += -DHAVE_MMAP +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 \ + deps/lightrec/reaper.o endif OBJS += deps/lightrec/tlsf/tlsf.o OBJS += libpcsxcore/lightrec/plugin.o @@ -107,18 +120,18 @@ OBJS += deps/lightning/lib/jit_disasm.o \ deps/lightning/lib/jit_size.o \ deps/lightning/lib/lightning.o \ deps/lightrec/blockcache.o \ + deps/lightrec/constprop.o \ deps/lightrec/disassembler.o \ deps/lightrec/emitter.o \ deps/lightrec/interpreter.o \ deps/lightrec/lightrec.o \ deps/lightrec/memmanager.o \ deps/lightrec/optimizer.o \ - deps/lightrec/regcache.o \ - deps/lightrec/recompiler.o \ - deps/lightrec/reaper.o + deps/lightrec/regcache.o +deps/lightning/%.o: CFLAGS += -DHAVE_MMAP=P_HAVE_MMAP libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE ifeq ($(MMAP_WIN32),1) -CFLAGS += -Iinclude/mman +CFLAGS += -Iinclude/mman -I deps/mman OBJS += deps/mman/mman.o endif else ifeq "$(DYNAREC)" "ari64" @@ -136,7 +149,7 @@ OBJS += libpcsxcore/new_dynarec/pcsxmem.o else CFLAGS += -DDRC_DISABLE endif -OBJS += libpcsxcore/new_dynarec/emu_if.o +OBJS += libpcsxcore/new_dynarec/emu_if.o libpcsxcore/new_dynarec/events.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 @@ -316,20 +329,20 @@ 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 +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 -CFLAGS += -Ilibretro-common/include +CFLAGS += -Ideps/libretro-common/include CFLAGS += -DFRONTEND_SUPPORTS_RGB565 CFLAGS += -DHAVE_LIBRETRO