X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Makefile;h=b44c1f274daa71ee613facb8626eb505f1bfde7b;hb=030d1121f27550429364745419fc5e6161a2a431;hp=2e67178d78de302d8dff509a183b1b950df75bfe;hpb=a1b44e3650691750cff4bf1c5bc04a36c3e8066d;p=pcsx_rearmed.git diff --git a/Makefile b/Makefile index 2e67178d..b44c1f27 100644 --- a/Makefile +++ b/Makefile @@ -1,18 +1,24 @@ # Makefile for PCSX ReARMed # default stuff goes here, so that config can override -TARGET = pcsx -CFLAGS += -Wall -ggdb -Ifrontend -ffast-math -LDLIBS += -lpthread -ifndef DEBUG +TARGET ?= pcsx +CFLAGS += -Wall -Iinclude -ffast-math +ifeq ($(DEBUG), 1) +CFLAGS += -O0 -ggdb +else +ifeq ($(platform), vita) +CFLAGS += -O3 -DNDEBUG +else CFLAGS += -O2 -DNDEBUG endif +endif CXXFLAGS += $(CFLAGS) #DRC_DBG = 1 #PCNT = 1 all: config.mak target_ plugins_ +ifndef NO_CONFIG_MAK ifneq ($(wildcard config.mak),) config.mak: ./configure @echo $@ is out-of-date, running configure @@ -23,10 +29,16 @@ config.mak: @echo "Please run ./configure before running make!" @exit 1 endif +else # NO_CONFIG_MAK +config.mak: +endif + -include Makefile.local -CC_LINK = $(CC) +CC_LINK ?= $(CC) +CC_AS ?= $(CC) LDFLAGS += $(MAIN_LDFLAGS) +EXTRA_LDFLAGS ?= -Wl,-Map=$@.map LDLIBS += $(MAIN_LDLIBS) ifdef PCNT CFLAGS += -DPCNT @@ -40,31 +52,50 @@ 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 ifeq "$(HAVE_NEON)" "1" OBJS += libpcsxcore/gte_neon.o endif -libpcsxcore/gte.o libpcsxcore/gte_nf.o: CFLAGS += -fno-strict-aliasing -libpcsxcore/cdrom.o libpcsxcore/misc.o: CFLAGS += -Wno-pointer-sign -libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull +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 +OBJS += libpcsxcore/new_dynarec/new_dynarec.o libpcsxcore/new_dynarec/arm/linkage_arm.o +OBJS += libpcsxcore/new_dynarec/backends/psx/pcsxmem.o +else +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 +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 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 @@ -76,6 +107,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 @@ -99,43 +135,118 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o -ifeq "$(HAVE_NEON)" "1" -OBJS += plugins/gpulib/cspace_neon.o -else -OBJS += plugins/gpulib/cspace.o -endif ifeq "$(BUILTIN_GPU)" "neon" +CFLAGS += -DGPU_NEON OBJS += plugins/gpu_neon/psx_gpu_if.o 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 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" -OBJS += plugins/gpulib/cspace.o +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 -plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 +plugins/gpu_unai/gpulib_if.o: CFLAGS += -DREARMED -O3 CC_LINK = $(CXX) 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 # frontend/gui +OBJS += frontend/cspace.o +ifeq "$(HAVE_NEON)" "1" +OBJS += frontend/cspace_neon.o +else +ifeq "$(ARCH)" "arm" +OBJS += frontend/cspace_arm.o +endif +endif + ifeq "$(PLATFORM)" "generic" -OBJS += frontend/libpicofe/in_sdl.o frontend/plat_sdl.o +OBJS += frontend/libpicofe/in_sdl.o +OBJS += frontend/libpicofe/plat_sdl.o OBJS += frontend/libpicofe/plat_dummy.o OBJS += frontend/libpicofe/linux/in_evdev.o +OBJS += frontend/plat_sdl.o +ifeq "$(HAVE_GLES)" "1" +OBJS += frontend/libpicofe/gl.o frontend/libpicofe/gl_platform.o +LDLIBS += $(LDLIBS_GLES) +frontend/libpicofe/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/libpicofe/gl_platform.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/libpicofe/gl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +frontend/plat_sdl.o: CFLAGS += -DHAVE_GLES $(CFLAGS_GLES) +endif USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif @@ -144,7 +255,8 @@ OBJS += frontend/libpicofe/pandora/plat.o 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 pandora/ui_feat.h +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 @@ -153,19 +265,28 @@ OBJS += frontend/libpicofe/gp2x/in_gp2x.o frontend/warm/warm.o OBJS += frontend/libpicofe/gp2x/soc_pollux.o OBJS += frontend/libpicofe/linux/in_evdev.o OBJS += frontend/plat_pollux.o frontend/in_tsbutton.o frontend/blit320.o -libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS -frontend/main.o frontend/menu.o: CFLAGS += -include 320240/ui_gp2x.h +frontend/main.o frontend/menu.o: CFLAGS += -include frontend/320240/ui_gp2x.h USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif ifeq "$(PLATFORM)" "maemo" -OBJS += maemo/hildon.o maemo/main.o +OBJS += maemo/hildon.o maemo/main.o maemo/maemo_xkb.o frontend/pl_gun_ts.o maemo/%.o: maemo/%.c USE_PLUGIN_LIB = 1 +LDFLAGS += $(shell pkg-config --libs hildon-1 libpulse) +CFLAGS += $(shell pkg-config --cflags hildon-1) -DHAVE_TSLIB +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" OBJS += frontend/libretro.o -OBJS += frontend/linux/plat_mmap.o +CFLAGS += -Ilibretro-common/include +CFLAGS += -DFRONTEND_SUPPORTS_RGB565 +CFLAGS += -DHAVE_LIBRETRO + +ifeq ($(MMAP_WIN32),1) +OBJS += libpcsxcore/memmap_win32.o +endif endif ifeq "$(USE_PLUGIN_LIB)" "1" @@ -195,7 +316,8 @@ endif OBJS += frontend/main.o frontend/plugin.o -frontend/menu.o frontend/main.o frontend/plat_sdl.o: frontend/revision.h +frontend/menu.o frontend/main.o: frontend/revision.h +frontend/plat_sdl.o frontend/libretro.o: frontend/revision.h frontend/libpicofe/%.c: @echo "libpicofe module is missing, please run:" @@ -211,16 +333,25 @@ frontend/revision.h: FORCE @rm $@_ %.o: %.S - $(CC) $(CFLAGS) -c $^ -o $@ + $(CC_AS) $(CFLAGS) -c $^ -o $@ + +%.o: %.cpp + $(CXX) $(CXXFLAGS) -c -o $@ $< +%.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< target_: $(TARGET) $(TARGET): $(OBJS) - $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map +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 + $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h ifneq ($(PLUGINS),) plugins_: $(PLUGINS) @@ -259,7 +390,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