From 6c3bf565033ec064bdd5ff7e9ce446db9f02522c Mon Sep 17 00:00:00 2001
From: Ivan Epifanov <isage.dna@gmail.com>
Date: Mon, 23 Nov 2020 12:44:54 +0300
Subject: [PATCH] Unified build with both renderers

---
 ...le.vita.gles2.dolce => Makefile.vita.dolce |  3 +-
 Makefile.vita.gxm.dolce                       | 58 -------------------
 include/SDL_config_vita.h                     |  6 +-
 src/render/SDL_render.c                       |  6 +-
 4 files changed, 8 insertions(+), 65 deletions(-)
 rename Makefile.vita.gles2.dolce => Makefile.vita.dolce (97%)
 delete mode 100644 Makefile.vita.gxm.dolce

diff --git a/Makefile.vita.gles2.dolce b/Makefile.vita.dolce
similarity index 97%
rename from Makefile.vita.gles2.dolce
rename to Makefile.vita.dolce
index 7ad460cfe..44c3cc338 100644
--- a/Makefile.vita.gles2.dolce
+++ b/Makefile.vita.dolce
@@ -21,6 +21,7 @@ SOURCES = \
 	src/filesystem/vita/*.c \
 	src/render/*.c \
 	src/render/software/*.c \
+	src/render/vitagxm/*.c \
 	src/render/vitagles2/*.c \
 	src/sensor/*.c \
 	src/sensor/vita/*.c \
@@ -41,7 +42,7 @@ CC      = $(PREFIX)-gcc
 AR      = $(PREFIX)-ar
 CFLAGS  = -g -Wl,-q -Wall -O3 -Iinclude \
                         -D__VITA__ -D__ARM_ARCH=7 -D__ARM_ARCH_7A__ \
-                        -mfpu=neon -mcpu=cortex-a9 -mfloat-abi=hard -D_VITA_GLES2_
+                        -mfpu=neon -mcpu=cortex-a9 -mfloat-abi=hard
 ASFLAGS = $(CFLAGS)
 
 $(TARGET_LIB): $(OBJS)
diff --git a/Makefile.vita.gxm.dolce b/Makefile.vita.gxm.dolce
deleted file mode 100644
index bc560fda5..000000000
--- a/Makefile.vita.gxm.dolce
+++ /dev/null
@@ -1,58 +0,0 @@
-# Based on port by xerpi
-# Makefile to build the SDL library
-
-TARGET_LIB = libSDL2.a
-
-SOURCES = \
-	src/*.c \
-	src/atomic/*.c \
-	src/audio/*.c \
-	src/audio/vita/*.c \
-	src/cpuinfo/*.c \
-	src/events/*.c \
-	src/file/*.c \
-	src/haptic/*.c \
-	src/haptic/dummy/*.c \
-	src/joystick/*.c \
-	src/joystick/vita/*.c \
-	src/loadso/dummy/*.c \
-	src/power/*.c \
-	src/power/vita/*.c \
-	src/filesystem/vita/*.c \
-	src/render/*.c \
-	src/render/software/*.c \
-	src/render/vitagxm/*.c \
-	src/sensor/*.c \
-	src/sensor/vita/*.c \
-	src/stdlib/*.c \
-	src/thread/*.c \
-	src/thread/generic/SDL_systls.c \
-	src/thread/vita/*.c \
-	src/timer/*.c \
-	src/timer/vita/*.c \
-	src/video/*.c \
-	src/video/vita/*.c \
-	src/video/yuv2rgb/*.c \
-
-OBJS = $(shell echo $(SOURCES) | sed -e 's,\.c,\.o,g')
-
-PREFIX  = arm-dolce-eabi
-CC      = $(PREFIX)-gcc
-AR      = $(PREFIX)-ar
-CFLAGS  = -g -Wl,-q -Wall -O3 -Iinclude \
-                        -D__VITA__ -D__ARM_ARCH=7 -D__ARM_ARCH_7A__ \
-                        -mfpu=neon -mcpu=cortex-a9 -mfloat-abi=hard -D_VITA_GXM_
-ASFLAGS = $(CFLAGS)
-
-$(TARGET_LIB): $(OBJS)
-	$(AR) rcs $@ $^
-
-clean:
-	@rm -f $(TARGET_LIB) $(OBJS)
-
-install: $(TARGET_LIB)
-	@mkdir -p "$(DOLCESDK)/arm-dolce-eabi/lib"
-	@cp  $(TARGET_LIB) $(DOLCESDK)/arm-dolce-eabi/lib
-	@mkdir -p "$(DOLCESDK)/arm-dolce-eabi/include/SDL2"
-	@cp include/*.h "$(DOLCESDK)/arm-dolce-eabi/include/SDL2"
-	@echo "Installed!"
diff --git a/include/SDL_config_vita.h b/include/SDL_config_vita.h
index e34767df2..3d3184fdf 100644
--- a/include/SDL_config_vita.h
+++ b/include/SDL_config_vita.h
@@ -139,11 +139,11 @@
 #define SDL_FILESYSTEM_VITA   1
 #define SDL_SENSOR_VITA 1
 
-#if defined(_VITA_GLES2_)
+//#if defined(_VITA_GLES2_)
  #define SDL_VIDEO_RENDER_VITA_GLES2 1
-#else
+//#else
  #define SDL_VIDEO_RENDER_VITA_GXM 1
-#endif
+//#endif
 
 #if defined(SDL_VIDEO_RENDER_VITA_GLES2) || defined(SDL_VIDEO_RENDER_VITA_GXM)
  #define SDL_VIDEO_OPENGL_ES2 1
diff --git a/src/render/SDL_render.c b/src/render/SDL_render.c
index b5cf9c56e..0552918ab 100644
--- a/src/render/SDL_render.c
+++ b/src/render/SDL_render.c
@@ -104,12 +104,12 @@ static const SDL_RenderDriver *render_drivers[] = {
 #if SDL_VIDEO_RENDER_PSP
     &PSP_RenderDriver,
 #endif
-#if SDL_VIDEO_RENDER_VITA_GLES2
-    &VITA_GLES2_RenderDriver,
-#endif
 #if SDL_VIDEO_RENDER_VITA_GXM
     &VITA_GXM_RenderDriver,
 #endif
+#if SDL_VIDEO_RENDER_VITA_GLES2
+    &VITA_GLES2_RenderDriver,
+#endif
 #if SDL_VIDEO_RENDER_SW
     &SW_RenderDriver
 #endif