Fixed 2D video on Android

There was a dummy renderer left in there which was overriding the OpenGL ES renderer.

Makefile.android

@@ -28,6 +28,7 @@ SOURCES = \
 	src/video/*.c \
 	src/power/*.c \
 	src/audio/android/*.c \
+	src/audio/dummy/*.c \
 	src/video/android/*.c \
 	src/joystick/android/*.c \
 	src/haptic/dummy/*.c \

include/SDL_config_android.h

@@ -55,8 +55,6 @@ typedef unsigned int uint32_t;
 #define HAVE_SIGNAL_H	1
 
 /* C library functions */
-#define HAVE_ATAN	1
-#define HAVE_ATAN2	1
 #define HAVE_MALLOC	1
 #define HAVE_CALLOC	1
 #define HAVE_REALLOC	1
@@ -95,6 +93,9 @@ typedef unsigned int uint32_t;
 #define HAVE_SSCANF	1
 #define HAVE_SNPRINTF	1
 #define HAVE_VSNPRINTF	1
+#define HAVE_M_PI	1
+#define HAVE_ATAN	1
+#define HAVE_ATAN2	1
 #define HAVE_CEIL	1
 #define HAVE_COPYSIGN	1
 #define HAVE_COS	1
@@ -117,15 +118,16 @@ typedef unsigned int uint32_t;
 typedef unsigned int size_t;
 //typedef unsigned long uintptr_t;
 
+/* Enable various audio drivers */
 #define SDL_AUDIO_DRIVER_ANDROID	1
+#define SDL_AUDIO_DRIVER_DUMMY	1
 
-#define SDL_CDROM_DISABLED 1
-
-#define SDL_HAPTIC_DISABLED 1
+/* Enable various input drivers */
+#define SDL_JOYSTICK_ANDROID	1
+#define SDL_HAPTIC_DUMMY	1
 
-#define SDL_JOYSTICK_ANDROID 1
-
-#define SDL_LOADSO_DISABLED 1
+/* Enable various shared object loading systems */
+#define SDL_LOADSO_DUMMY	1
 
 /* Enable various threading systems */
 #define SDL_THREAD_PTHREAD	1
@@ -134,14 +136,11 @@ typedef unsigned int size_t;
 /* Enable various timer systems */
 #define SDL_TIMER_UNIX	1
 
+/* Enable various video drivers */
 #define SDL_VIDEO_DRIVER_ANDROID 1
 
-#define HAVE_STDIO_H 1
-#define HAVE_SYS_TYPES_H 1
-
-#define HAVE_M_PI 1
-
-#define SDL_VIDEO_RENDER_OGL_ES 1
+/* Enable OpenGL ES */
+#define SDL_VIDEO_OPENGL_ES	1
+#define SDL_VIDEO_RENDER_OGL_ES	1
 
 #endif /* _SDL_config_minimal_h */
-

src/video/android/SDL_androidrender.h

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2010 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-#include "SDL_config.h"
-
-/* SDL surface based renderer implementation */
-
-extern SDL_RenderDriver Android_RenderDriver;
-
-/* vi: set ts=4 sw=4 expandtab: */

src/video/android/SDL_androidvideo.c

@@ -32,7 +32,6 @@
 
 #include "SDL_androidvideo.h"
 #include "SDL_androidevents.h"
-#include "SDL_androidrender.h"
 
 #define ANDROID_VID_DRIVER_NAME "Android"
 
@@ -133,7 +132,6 @@ Android_VideoInit(_THIS)
     if (SDL_AddBasicVideoDisplay(&mode) < 0) {
         return -1;
     }
-    SDL_AddRenderDriver(&_this->displays[0], &Android_RenderDriver);
 
     SDL_zero(mode);
     SDL_AddDisplayMode(&_this->displays[0], &mode);