UseGlshim option renamed to UseGl4es

project/jni/sdl-1.2/Android.mk

@@ -57,8 +57,8 @@ LOCAL_SRC_FILES := $(foreach F, $(SDL_SRCS), $(addprefix $(dir $(F)),$(notdir $(
 
 LOCAL_SHARED_LIBRARIES := sdl_native_helpers # Not really a dependency, needed for CustomBuildScript
 
-ifdef USE_GLSHIM
-LOCAL_STATIC_LIBRARIES := glshim
+ifdef USE_GL4ES
+LOCAL_STATIC_LIBRARIES := gl4es
 endif
 
 LOCAL_LDLIBS := $(APPLICATION_GLES_LIBRARY) -ldl -llog

project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c

@@ -61,7 +61,7 @@ If you compile this code with SDL 1.3 or newer, or use in some other way, the li
 
 #include "SDL_opengles.h"
 
-#ifdef USE_GLSHIM
+#ifdef USE_GL4ES
 #include <GL/gl.h>
 #endif
 
@@ -1253,7 +1253,7 @@ void SDL_ANDROID_VideoContextRecreated()
 
 static void* ANDROID_GL_GetProcAddress(_THIS, const char *proc)
 {
-#ifdef USE_GLSHIM
+#ifdef USE_GL4ES
 	void * func = glXGetProcAddress(proc);
 #else
 	void * func = dlsym(glLibraryHandle, proc);