X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=Makefile;h=0d72dea0d8d9b4fef43323a1706959338dd42da9;hp=83f343f82085bdb59835ff88215d1891f4d8efb3;hb=74df590696210f20503a2e15bae404978e3a3553;hpb=87e5b45fe1aa734289cf57531c89988cfafff524

diff --git a/Makefile b/Makefile
index 83f343f8..0d72dea0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 # default stuff goes here, so that config can override
 TARGET = pcsx
-CFLAGS += -Wall -ggdb -Ifrontend -ffast-math
+CFLAGS += -Wall -ggdb -Iinclude -ffast-math
 LDLIBS += -lpthread
 ifndef DEBUG
 CFLAGS += -O2 -DNDEBUG
@@ -120,7 +120,7 @@ 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
 
@@ -132,9 +132,19 @@ OBJS += plugins/dfinput/main.o plugins/dfinput/pad.o plugins/dfinput/guncon.o
 
 # frontend/gui
 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
@@ -143,7 +153,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
+frontend/main.o frontend/menu.o: CFLAGS += -include frontend/pandora/ui_feat.h
 USE_PLUGIN_LIB = 1
 USE_FRONTEND = 1
 endif
@@ -152,7 +162,7 @@ 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
-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
@@ -163,6 +173,7 @@ USE_PLUGIN_LIB = 1
 endif
 ifeq "$(PLATFORM)" "libretro"
 OBJS += frontend/libretro.o
+CFLAGS += -DFRONTEND_SUPPORTS_RGB565
 endif
 
 ifeq "$(USE_PLUGIN_LIB)" "1"
@@ -192,7 +203,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 +229,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)