X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=e694818dbedec5b52044c8f4816654db6c7256ed;hb=f4c049fddb2613c5837db83daa2babb3fdf78f70;hp=2a6be72bdd0c626ba022e0a5ef72e8f19dd12618;hpb=f0a02fdcf0043d9afa9c4b26c38c28cb761e1e10;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 2a6be72b..e694818d 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CFLAGS += -Wall -Iinclude -ffast-math ifeq ($(DEBUG), 1) CFLAGS += -O0 -ggdb else -ifeq ($(platform), vita) +ifeq ($(platform), $(filter $(platform), vita ctr)) CFLAGS += -O3 -DNDEBUG else CFLAGS += -O2 -DNDEBUG @@ -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,40 +48,106 @@ 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/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 endif -ifeq "$(HAVE_NEON)" "1" +ifeq "$(HAVE_NEON_ASM)" "1" OBJS += libpcsxcore/gte_neon.o endif libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull # dynarec -ifeq "$(USE_DYNAREC)" "1" -OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/arm/linkage_arm.o -OBJS += libpcsxcore/new_dynarec/backends/psx/pcsxmem.o +ifeq "$(DYNAREC)" "lightrec" +CFLAGS += -Ideps/lightning/include -Ideps/lightrec -Iinclude/lightning -Iinclude/lightrec \ + -DLIGHTREC -DLIGHTREC_STATIC +LIGHTREC_CUSTOM_MAP ?= 0 +LIGHTREC_THREADED_COMPILER ?= 0 +CFLAGS += -DLIGHTREC_CUSTOM_MAP=$(LIGHTREC_CUSTOM_MAP) \ + -DLIGHTREC_ENABLE_THREADED_COMPILER=$(LIGHTREC_THREADED_COMPILER) +deps/lightning/lib/%.o: CFLAGS += -DHAVE_MMAP +ifeq ($(LIGHTREC_CUSTOM_MAP),1) +LDLIBS += -lrt +OBJS += libpcsxcore/lightrec/mem.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 +OBJS += deps/lightning/lib/jit_disasm.o \ + deps/lightning/lib/jit_memory.o \ + deps/lightning/lib/jit_names.o \ + deps/lightning/lib/jit_note.o \ + deps/lightning/lib/jit_print.o \ + deps/lightning/lib/jit_size.o \ + deps/lightning/lib/lightning.o \ + deps/lightrec/blockcache.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 +libpcsxcore/lightrec/mem.o: CFLAGS += -D_GNU_SOURCE +ifeq ($(MMAP_WIN32),1) +CFLAGS += -Iinclude/mman -I deps/mman +OBJS += deps/mman/mman.o +endif +else ifeq "$(DYNAREC)" "ari64" +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 -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/backends/psx/emu_if.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/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 @@ -119,21 +188,43 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o ifeq "$(BUILTIN_GPU)" "neon" -OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o +CFLAGS += -DGPU_NEON +OBJS += plugins/gpu_neon/psx_gpu_if.o plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c +frontend/menu.o frontend/plugin_lib.o: CFLAGS += -DBUILTIN_GPU_NEON + ifeq "$(HAVE_NEON_ASM)" "1" + OBJS += plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o + else + OBJS += plugins/gpu_neon/psx_gpu/psx_gpu_simd.o + plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DSIMD_BUILD + plugins/gpu_neon/psx_gpu/psx_gpu_simd.o: CFLAGS += -DSIMD_BUILD + endif endif ifeq "$(BUILTIN_GPU)" "peops" +CFLAGS += -DGPU_PEOPS # note: code is not safe for strict-aliasing? (Castlevania problems) plugins/dfxvideo/gpulib_if.o: CFLAGS += -fno-strict-aliasing plugins/dfxvideo/gpulib_if.o: plugins/dfxvideo/prim.c plugins/dfxvideo/soft.c OBJS += plugins/dfxvideo/gpulib_if.o +ifeq "$(THREAD_RENDERING)" "1" +CFLAGS += -DTHREAD_RENDERING +OBJS += plugins/gpulib/gpulib_thread_if.o +endif endif ifeq "$(BUILTIN_GPU)" "unai" +CFLAGS += -DGPU_UNAI +CFLAGS += -DUSE_GPULIB=1 +#CFLAGS += -DINLINE="static __inline__" +#CFLAGS += -Dasm="__asm__ __volatile__" OBJS += plugins/gpu_unai/gpulib_if.o ifeq "$(ARCH)" "arm" OBJS += plugins/gpu_unai/gpu_arm.o endif +ifeq "$(THREAD_RENDERING)" "1" +CFLAGS += -DTHREAD_RENDERING +OBJS += plugins/gpulib/gpulib_thread_if.o +endif plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 CC_LINK = $(CXX) endif @@ -141,16 +232,44 @@ endif # cdrcimg OBJS += plugins/cdrcimg/cdrcimg.o +# libchdr +ifeq "$(HAVE_CHD)" "1" +CFLAGS += -Ideps/libchdr/include +CFLAGS += -Ideps/libchdr/include/libchdr +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/libchdr/deps/lzma-19.00/include +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)" "1" +ifeq "$(HAVE_NEON_ASM)" "1" OBJS += frontend/cspace_neon.o +frontend/cspace.o: CFLAGS += -DHAVE_bgr555_to_rgb565 -DHAVE_bgr888_to_x else ifeq "$(ARCH)" "arm" OBJS += frontend/cspace_arm.o +frontend/cspace.o: CFLAGS += -DHAVE_bgr555_to_rgb565 endif endif @@ -200,20 +319,37 @@ 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 CFLAGS += -DHAVE_LIBRETRO +ifneq ($(DYNAREC),lightrec) ifeq ($(MMAP_WIN32),1) OBJS += libpcsxcore/memmap_win32.o endif endif +endif 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 -ifeq "$(HAVE_NEON)" "1" +frontend/libpicofe/linux/plat.o: CFLAGS += -DNO_HOME_DIR +ifeq "$(HAVE_NEON_ASM)" "1" OBJS += frontend/libpicofe/arm/neon_scale2x.o OBJS += frontend/libpicofe/arm/neon_eagle2x.o frontend/libpicofe/arm/neon_scale2x.o: CFLAGS += -DDO_BGR_TO_RGB @@ -248,7 +384,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 $@_ @@ -258,7 +394,8 @@ frontend/revision.h: FORCE %.o: %.cpp $(CXX) $(CXXFLAGS) -c -o $@ $< - +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< target_: $(TARGET) @@ -291,7 +428,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe HEAD) +VER ?= $(shell git describe --always HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER)