X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=a7d61d9d5670321ce9f5de12a009666232634753;hp=d0e4befca0368a9ba64266109f1e27e0fcc18aa9;hb=603efa29ac7176c5dc27cab52007d4c9f61c3069;hpb=e0aec5eebf0fefe7a7314940546ef8a23d2169b7

diff --git a/Makefile b/Makefile
index d0e4befc..a7d61d9d 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
@@ -144,6 +143,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 +153,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