From cd5abe38be33f4ac20627cbeac5246b9bee22715 Mon Sep 17 00:00:00 2001 From: notaz Date: Sat, 22 Sep 2012 19:32:10 +0300 Subject: frontend: pandora: update run script --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c10f739..af11087 100644 --- a/Makefile +++ b/Makefile @@ -215,7 +215,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe master) +VER ?= $(shell git describe HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER) -- cgit v1.2.3 From fa56d36096cd4ab2b227ce2aa61c8404b8874689 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 29 Oct 2012 01:08:35 +0200 Subject: move blit to core, allow filtering while blitting also adds libpicofe to pull filters from, and filter related UI stuff --- Makefile | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index af11087..1f3e736 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,14 @@ OBJS += plugins/cdrcimg/cdrcimg.o # dfinput OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o +# misc +ifeq "$(HAVE_NEON)" "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 +frontend/libpicofe/arm/neon_eagle2x.o: CFLAGS += -DDO_BGR_TO_RGB +endif + # gui OBJS += frontend/main.o frontend/plugin.o OBJS += frontend/common/readpng.o frontend/common/fonts.o @@ -178,6 +186,12 @@ endif frontend/%.o: CFLAGS += -DIN_EVDEV frontend/menu.o frontend/main.o frontend/plat_sdl.o: frontend/revision.h +frontend/libpicofe/arm/neon_scale2x.S frontend/libpicofe/menu.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 @@ -185,7 +199,6 @@ frontend/revision.h: FORCE @(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ @diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@ @rm $@_ -.PHONY: FORCE %.o: %.S $(CC) $(CFLAGS) -c $^ -o $@ @@ -213,6 +226,8 @@ plugins_: clean_plugins: endif +.PHONY: all clean target_ plugins_ clean_plugins FORCE + # ----------- release ----------- VER ?= $(shell git describe HEAD) -- cgit v1.2.3 From cc56203b76e1fcef2c7e55b460daf07e654a1547 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 5 Nov 2012 00:28:57 +0200 Subject: switch over to libpicofe - libretro should not be affected by this, all others need to do 'git submodule init && git submodule update' from now on. - pandora should get gamma control support --- Makefile | 59 ++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 23 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1f3e736..833dddc 100644 --- a/Makefile +++ b/Makefile @@ -127,47 +127,56 @@ OBJS += plugins/cdrcimg/cdrcimg.o # dfinput OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o -# misc -ifeq "$(HAVE_NEON)" "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 -frontend/libpicofe/arm/neon_eagle2x.o: CFLAGS += -DDO_BGR_TO_RGB -endif - -# gui -OBJS += frontend/main.o frontend/plugin.o -OBJS += frontend/common/readpng.o frontend/common/fonts.o -OBJS += frontend/linux/plat.o - +# frontend/gui ifeq "$(PLATFORM)" "generic" -OBJS += frontend/plat_sdl.o frontend/common/in_sdl.o +OBJS += frontend/libpicofe/in_sdl.o frontend/plat_sdl.o +OBJS += frontend/libpicofe/plat_dummy.o +OBJS += frontend/libpicofe/linux/in_evdev.o +USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif ifeq "$(PLATFORM)" "pandora" -OBJS += frontend/linux/fbdev.o -OBJS += frontend/plat_omap.o frontend/linux/xenv.o -OBJS += frontend/plat_pandora.o +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 +USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif ifeq "$(PLATFORM)" "caanoo" +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 -OBJS += frontend/gp2x/in_gp2x.o frontend/warm/warm.o libpcsxcore/new_dynarec/pcsxmem.o: CFLAGS += -DCUSTOM_MEMMAPS +USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif ifeq "$(PLATFORM)" "maemo" OBJS += maemo/hildon.o maemo/main.o maemo/%.o: maemo/%.c -OBJS += frontend/plugin_lib.o +USE_PLUGIN_LIB = 1 endif ifeq "$(PLATFORM)" "libretro" OBJS += frontend/libretro.o +OBJS += frontend/linux/plat_mmap.o endif -ifeq "$(USE_FRONTEND)" "1" -OBJS += frontend/menu.o frontend/linux/in_evdev.o -OBJS += frontend/common/input.o + +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" +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 +frontend/libpicofe/arm/neon_eagle2x.o: CFLAGS += -DDO_BGR_TO_RGB +endif +endif +ifeq "$(USE_FRONTEND)" "1" +OBJS += frontend/menu.o +OBJS += frontend/libpicofe/input.o +frontend/menu.o: frontend/libpicofe/menu.c ifeq "$(HAVE_TSLIB)" "1" frontend/%.o: CFLAGS += -DHAVE_TSLIB OBJS += frontend/pl_gun_ts.o @@ -183,10 +192,14 @@ 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/libpicofe/arm/neon_scale2x.S frontend/libpicofe/menu.c: +frontend/libpicofe/%.c: @echo "libpicofe module is missing, please run:" @echo "git submodule init && git submodule update" @exit 1 -- cgit v1.2.3 From 22fa3f2b3d09f3694f938ca895d447a30ec96f25 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 5 Nov 2012 00:58:51 +0200 Subject: detect undefined symbols early --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 833dddc..e904128 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ endif -include Makefile.local CC_LINK = $(CC) +LDFLAGS += $(MAIN_LDFLAGS) LDLIBS += $(MAIN_LDLIBS) # core -- cgit v1.2.3 From e0aec5eebf0fefe7a7314940546ef8a23d2169b7 Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 5 Nov 2012 01:23:29 +0200 Subject: drop some unused code --- Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index e904128..d0e4bef 100644 --- a/Makefile +++ b/Makefile @@ -28,6 +28,9 @@ endif CC_LINK = $(CC) LDFLAGS += $(MAIN_LDFLAGS) LDLIBS += $(MAIN_LDLIBS) +ifdef PCNT +CFLAGS += -DPCNT +endif # core OBJS += libpcsxcore/cdriso.o libpcsxcore/cdrom.o libpcsxcore/cheat.o libpcsxcore/debug.o \ @@ -186,18 +189,10 @@ 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/libpicofe/%.c: @@ -205,7 +200,6 @@ frontend/libpicofe/%.c: @echo "git submodule init && git submodule update" @exit 1 - libpcsxcore/gte_nf.o: libpcsxcore/gte.c $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS @@ -217,6 +211,7 @@ frontend/revision.h: FORCE %.o: %.S $(CC) $(CFLAGS) -c $^ -o $@ + target_: $(TARGET) $(TARGET): $(OBJS) -- cgit v1.2.3 From a1b44e3650691750cff4bf1c5bc04a36c3e8066d Mon Sep 17 00:00:00 2001 From: notaz Date: Tue, 6 Nov 2012 03:37:53 +0200 Subject: frontend: make platform menu customizations more explicit --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d0e4bef..2e67178 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,7 @@ 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 USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif @@ -153,6 +154,7 @@ 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 USE_PLUGIN_LIB = 1 USE_FRONTEND = 1 endif -- cgit v1.2.3 From c9099d020a1e523d97541f426f7d44da1392526f Mon Sep 17 00:00:00 2001 From: notaz Date: Sun, 18 Nov 2012 00:31:30 +0200 Subject: frontend: overlay improvements work directly on psx vram --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2e67178..a7d61d9 100644 --- a/Makefile +++ b/Makefile @@ -99,10 +99,9 @@ endif # builtin gpu OBJS += plugins/gpulib/gpu.o plugins/gpulib/vout_pl.o +OBJS += plugins/gpulib/cspace.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 -- cgit v1.2.3 From 448bbcae9cc8f72f2e1d893c6ae8e071ca2b7aa9 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 21 Nov 2012 03:11:59 +0200 Subject: fix ARM build with --disable-dynarec --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a7d61d9..49d5476 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,8 @@ libpcsxcore/misc.o libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull 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 endif OBJS += libpcsxcore/new_dynarec/emu_if.o libpcsxcore/new_dynarec/new_dynarec.o: libpcsxcore/new_dynarec/assem_arm.c \ -- cgit v1.2.3 From 305c8c935f912467121a473f945a42a325034417 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 21 Nov 2012 03:47:35 +0200 Subject: fix various warnings the idea here was to disable them to avoid drifting from pcsx-reloaded, but there doesn't seems to be much need for syncing. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 49d5476..a2a811f 100644 --- a/Makefile +++ b/Makefile @@ -47,8 +47,7 @@ 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" -- cgit v1.2.3 From eac3852265815a2e57ea9987a2bea2fcadd3f022 Mon Sep 17 00:00:00 2001 From: notaz Date: Wed, 21 Nov 2012 03:51:26 +0200 Subject: gte: avoid fno-strict-aliasing --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a2a811f..548d8a0 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,6 @@ endif ifeq "$(HAVE_NEON)" "1" OBJS += libpcsxcore/gte_neon.o endif -libpcsxcore/gte.o libpcsxcore/gte_nf.o: CFLAGS += -fno-strict-aliasing libpcsxcore/psxbios.o: CFLAGS += -Wno-nonnull # dynarec -- cgit v1.2.3