X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=5b2bef7c0067f1ddc470f0c2da43d16aa0cb3e20;hp=493306cf6ab618c987b649a72dfedde38a15ee6e;hb=a53073ec52f5944c7833e176fec5ac49dc9e1e45;hpb=da710571b75db7031b82924ab3ad47eb645ce215

diff --git a/Makefile b/Makefile
index 493306cf..5b2bef7c 100644
--- a/Makefile
+++ b/Makefile
@@ -99,10 +99,6 @@ 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
-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
@@ -115,12 +111,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
 
@@ -131,10 +126,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
@@ -157,12 +171,17 @@ 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
+CFLAGS += -DFRONTEND_SUPPORTS_RGB565
 endif
 
 ifeq "$(USE_PLUGIN_LIB)" "1"
@@ -192,7 +211,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:"
@@ -217,7 +237,7 @@ $(TARGET): $(OBJS)
 	$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
 
 clean: $(PLAT_CLEAN) clean_plugins
-	$(RM) $(TARGET) $(OBJS) $(TARGET).map
+	$(RM) $(TARGET) $(OBJS) $(TARGET).map frontend/revision.h
 
 ifneq ($(PLUGINS),)
 plugins_: $(PLUGINS)