X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=d6cb946c2407abe1336423c9162bb2a6077e773e;hb=c765eb86debdc06fe304511bc2edbb6f3e3d7813;hp=a472492d33ddcb6d7f886ffadbb9ce478f0208b3;hpb=9aff1963cf8ca9bbba14d4c82674ad0075c604ac;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index a472492d..d6cb946c 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,16 @@ # default stuff goes here, so that config can override TARGET ?= pcsx -CFLAGS += -Wall -ggdb -Iinclude -ffast-math -ifndef DEBUG +CFLAGS += -Wall -Iinclude -ffast-math +ifeq ($(DEBUG), 1) +CFLAGS += -O0 -ggdb +else +ifeq ($(platform), $(filter $(platform), vita ctr)) +CFLAGS += -O3 -DNDEBUG +else CFLAGS += -O2 -DNDEBUG endif +endif CXXFLAGS += $(CFLAGS) #DRC_DBG = 1 #PCNT = 1 @@ -46,6 +52,23 @@ OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore libpcsxcore/psxhw.o libpcsxcore/psxinterpreter.o libpcsxcore/psxmem.o libpcsxcore/r3000a.o \ libpcsxcore/sio.o libpcsxcore/socket.o libpcsxcore/spu.o OBJS += libpcsxcore/gte.o libpcsxcore/gte_nf.o libpcsxcore/gte_divider.o +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 +endif ifeq "$(ARCH)" "arm" OBJS += libpcsxcore/gte_arm.o endif @@ -55,22 +78,52 @@ endif libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull # dynarec -ifeq "$(USE_DYNAREC)" "1" -OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/linkage_arm.o -OBJS += libpcsxcore/new_dynarec/pcsxmem.o +ifeq "$(DYNAREC)" "lightrec" +CFLAGS += -Ideps/lightning/include -Ideps/lightrec \ + -DLIGHTREC -DLIGHTREC_STATIC +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 \ + deps/lightrec/recompiler.o \ + deps/lightrec/reaper.o +ifeq ($(MMAP_WIN32),1) +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 else -libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -DDRC_DISABLE +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 endif -OBJS += libpcsxcore/new_dynarec/emu_if.o -libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \ - libpcsxcore/new_dynarec/pcsxmem_inline.c -libpcsxcore/new_dynarec/new_dynarec.o: CFLAGS += -Wno-all -Wno-pointer-sign ifdef DRC_DBG -libpcsxcore/new_dynarec/emu_if.o: CFLAGS += -D_FILE_OFFSET_BITS=64 +libpcsxcore/new_dynarec/backends/psx/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 endif # spu @@ -82,6 +135,11 @@ plugins/dfsound/spu.o: plugins/dfsound/adsr.c plugins/dfsound/reverb.c \ ifeq "$(ARCH)" "arm" OBJS += plugins/dfsound/arm_utils.o endif +ifeq "$(HAVE_C64_TOOLS)" "1" +plugins/dfsound/spu.o: CFLAGS += -DC64X_DSP +plugins/dfsound/spu.o: plugins/dfsound/spu_c64x.c +frontend/menu.o: CFLAGS += -DC64X_DSP +endif ifneq ($(findstring oss,$(SOUND_DRIVERS)),) plugins/dfsound/out.o: CFLAGS += -DHAVE_OSS OBJS += plugins/dfsound/oss.o @@ -106,17 +164,32 @@ 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 +ifeq "$(HAVE_NEON)" "1" +OBJS += plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP +else +plugins/gpu_neon/psx_gpu_if.o: CFLAGS += -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP +endif plugins/gpu_neon/psx_gpu_if.o: plugins/gpu_neon/psx_gpu/*.c 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 endif ifeq "$(BUILTIN_GPU)" "unai" +CFLAGS += -DGPU_UNAI +CFLAGS += -DUSE_GPULIB=1 +ifeq "$(THREAD_RENDERING)" "1" +CFLAGS += -DTHREAD_RENDERING +OBJS += plugins/gpulib/gpulib_thread_if.o +endif +#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 @@ -128,6 +201,62 @@ endif # cdrcimg OBJS += plugins/cdrcimg/cdrcimg.o +# libchdr +ifeq "$(HAVE_CHD)" "1" +CFLAGS += -Ideps/libchdr +OBJS += deps/crypto/md5.o +OBJS += deps/crypto/sha1.o +OBJS += deps/flac-1.3.2/src/libFLAC/bitmath.o +OBJS += deps/flac-1.3.2/src/libFLAC/bitreader.o +OBJS += deps/flac-1.3.2/src/libFLAC/cpu.o +OBJS += deps/flac-1.3.2/src/libFLAC/crc.o +OBJS += deps/flac-1.3.2/src/libFLAC/fixed.o +OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_sse2.o +OBJS += deps/flac-1.3.2/src/libFLAC/fixed_intrin_ssse3.o +OBJS += deps/flac-1.3.2/src/libFLAC/float.o +OBJS += deps/flac-1.3.2/src/libFLAC/format.o +OBJS += deps/flac-1.3.2/src/libFLAC/lpc.o +OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_avx2.o +OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse2.o +OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse41.o +OBJS += deps/flac-1.3.2/src/libFLAC/lpc_intrin_sse.o +OBJS += deps/flac-1.3.2/src/libFLAC/md5.o +OBJS += deps/flac-1.3.2/src/libFLAC/memory.o +OBJS += deps/flac-1.3.2/src/libFLAC/metadata_iterators.o +OBJS += deps/flac-1.3.2/src/libFLAC/metadata_object.o +OBJS += deps/flac-1.3.2/src/libFLAC/stream_decoder.o +OBJS += deps/flac-1.3.2/src/libFLAC/window.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/bitstream.o +OBJS += deps/libchdr/cdrom.o +OBJS += deps/libchdr/chd.o +OBJS += deps/libchdr/flac.o +OBJS += deps/libchdr/huffman.o + +ifneq (,$(findstring win,$(platform))) + CFLAGS += -DHAVE_FSEEKO + OBJS += deps/flac-1.3.2/src/libFLAC/windows_unicode_filenames.o +else + CFLAGS += -DHAVE_SYS_PARAM_H +endif + +CFLAGS += -Ideps/crypto -Ideps/flac-1.3.2/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/flac-1.3.2/src/libFLAC/include -Ideps/lzma-16.04/C +CFLAGS += -DHAVE_CHD -D'PACKAGE_VERSION="1.3.2"' -DFLAC__HAS_OGG=0 -DFLAC__NO_DLL -DHAVE_LROUND -DHAVE_STDINT_H -DHAVE_STDLIB_H -DFLAC__NO_DLL -D_7ZIP_ST +LDFLAGS += -lm +endif + # dfinput OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o @@ -164,6 +293,7 @@ OBJS += frontend/libpicofe/linux/fbdev.o frontend/libpicofe/linux/xenv.o OBJS += frontend/libpicofe/linux/in_evdev.o OBJS += frontend/plat_pandora.o frontend/plat_omap.o 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 endif @@ -187,7 +317,15 @@ LDFLAGS += `pkg-config --libs glib-2.0 libosso dbus-1 hildon-fm-2` endif ifeq "$(PLATFORM)" "libretro" 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" @@ -236,11 +374,20 @@ frontend/revision.h: FORCE %.o: %.S $(CC_AS) $(CFLAGS) -c $^ -o $@ +%.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< + +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< target_: $(TARGET) $(TARGET): $(OBJS) +ifeq ($(STATIC_LINKING), 1) + $(AR) rcs $@ $(OBJS) +else $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS) +endif clean: $(PLAT_CLEAN) clean_plugins $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h @@ -282,7 +429,7 @@ endif ifeq "$(PLATFORM)" "pandora" PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh -rel: pcsx $(PLUGINS) \ +rel: pcsx plugins/dfsound/pcsxr_spu_area3.out $(PLUGINS) \ frontend/pandora/pcsx.sh frontend/pandora/pcsx.pxml.templ frontend/pandora/pcsx.png \ frontend/pandora/picorestore frontend/pandora/skin readme.txt COPYING rm -rf out