X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=b23d33e30a2c4a976e4ef9aae8d30eb165d9d2ec;hp=833dddc35f61f05e323a9a066a355888b090927c;hb=ba10822d813767632c528102055e3eeb54730b2c;hpb=cc56203b76e1fcef2c7e55b460daf07e654a1547 diff --git a/Makefile b/Makefile index 833dddc3..b23d33e3 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,8 @@ # Makefile for PCSX ReARMed # default stuff goes here, so that config can override -TARGET = pcsx -CFLAGS += -Wall -ggdb -Ifrontend -ffast-math -LDLIBS += -lpthread +TARGET ?= pcsx +CFLAGS += -Wall -ggdb -Iinclude -ffast-math ifndef DEBUG CFLAGS += -O2 -DNDEBUG endif @@ -13,6 +12,7 @@ CXXFLAGS += $(CFLAGS) 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 +23,20 @@ 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 +endif # core OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \ @@ -42,14 +52,15 @@ 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 +else +libpcsxcore/new_dynarec/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 \ @@ -72,6 +83,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 @@ -95,11 +111,6 @@ 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" 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 @@ -112,12 +123,11 @@ 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 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 @@ -128,10 +138,29 @@ OBJS += plugins/cdrcimg/cdrcimg.o 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 @@ -140,6 +169,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 frontend/pandora/ui_feat.h +frontend/libpicofe/linux/plat.o: CFLAGS += -DPANDORA USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif @@ -148,18 +179,26 @@ 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 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 += -DFRONTEND_SUPPORTS_RGB565 + +ifeq ($(MMAP_WIN32),1) +OBJS += libpcsxcore/memmap_win32.o +endif endif ifeq "$(USE_PLUGIN_LIB)" "1" @@ -185,26 +224,18 @@ else CFLAGS += -DNO_FRONTEND endif -ifdef X11 -frontend/%.o: CFLAGS += -DX11 -OBJS += frontend/xkb.o -endif -ifdef PCNT -CFLAGS += -DPCNT -endif - # misc OBJS += frontend/main.o frontend/plugin.o -frontend/%.o: CFLAGS += -DIN_EVDEV -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:" @echo "git submodule init && git submodule update" @exit 1 - libpcsxcore/gte_nf.o: libpcsxcore/gte.c $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS @@ -214,15 +245,16 @@ frontend/revision.h: FORCE @rm $@_ %.o: %.S - $(CC) $(CFLAGS) -c $^ -o $@ + $(CC_AS) $(CFLAGS) -c $^ -o $@ + target_: $(TARGET) $(TARGET): $(OBJS) - $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map + $(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) $(EXTRA_LDFLAGS) clean: $(PLAT_CLEAN) clean_plugins - $(RM) $(TARGET) $(OBJS) $(TARGET).map + $(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h ifneq ($(PLUGINS),) plugins_: $(PLUGINS) @@ -261,7 +293,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