From aa4b72349d0253efaf8d8b8cf667650321fc9fe0 Mon Sep 17 00:00:00 2001 From: lubomyr Date: Sun, 6 Nov 2016 16:35:14 +0200 Subject: [PATCH] UseGlshim option renamed to UseGl4es --- changeAppSettings.sh | 16 ++++++++-------- project/jni/SettingsTemplate.mk | 4 ++-- project/jni/sdl-1.2/Android.mk | 4 ++-- .../src/video/android/SDL_androidvideo-1.2.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/changeAppSettings.sh b/changeAppSettings.sh index e22d75c78..661acbfc7 100755 --- a/changeAppSettings.sh +++ b/changeAppSettings.sh @@ -187,8 +187,8 @@ echo "# Use GLES 3.x context" >> AndroidAppSettings.cfg echo "# you need this option only if you're developing 3-d app (y) or (n)" >> AndroidAppSettings.cfg echo NeedGles3=$NeedGles3 >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg -echo "# Use glshim library for provide OpenGL 1.x functionality to OpenGL ES accelerated cards (y) or (n)" >> AndroidAppSettings.cfg -echo UseGlshim=$UseGlshim >> AndroidAppSettings.cfg +echo "# Use gl4es library for provide OpenGL 1.x functionality to OpenGL ES accelerated cards (y) or (n)" >> AndroidAppSettings.cfg +echo UseGl4es=$UseGl4es >> AndroidAppSettings.cfg echo >> AndroidAppSettings.cfg echo "# Application uses software video buffer - you're calling SDL_SetVideoMode() without SDL_HWSURFACE and without SDL_OPENGL," >> AndroidAppSettings.cfg echo "# this will allow small speed optimization. Enable this even when you're using SDL_HWSURFACE. (y) or (n)" >> AndroidAppSettings.cfg @@ -494,11 +494,11 @@ else NeedStencilBuffer=false fi -if [ "$UseGlshim" = "y" ] ; then - UseGlshimCFlags=-DUSE_GLSHIM=1 +if [ "$UseGl4es" = "y" ] ; then + UseGl4esCFlags=-DUSE_GL4ES=1 else - UseGlshim= - UseGlshimCFlags= + UseGl4es= + UseGl4esCFlags= fi if [ "$SwVideoMode" = "y" ] ; then @@ -941,7 +941,7 @@ cat project/jni/SettingsTemplate.mk | \ sed "s^APPLICATION_ADDITIONAL_LDFLAGS :=.*^APPLICATION_ADDITIONAL_LDFLAGS := $AppLdflags^" | \ sed "s^APPLICATION_GLES_LIBRARY :=.*^APPLICATION_GLES_LIBRARY := $GLESLib^" | \ sed "s^APPLICATION_OVERLAPS_SYSTEM_HEADERS :=.*^APPLICATION_OVERLAPS_SYSTEM_HEADERS := $AppOverlapsSystemHeaders^" | \ - sed "s^USE_GLSHIM :=.*^USE_GLSHIM := $UseGlshim^" | \ + sed "s^USE_GL4ES :=.*^USE_GL4ES := $UseGl4es^" | \ sed "s^SDL_ADDITIONAL_CFLAGS :=.*^SDL_ADDITIONAL_CFLAGS := \ $RedefinedKeycodes \ $RedefinedKeycodesScreenKb \ @@ -951,7 +951,7 @@ cat project/jni/SettingsTemplate.mk | \ $CompatibilityHacksSlowCompatibleEventQueue \ $CompatibilityHacksTouchscreenKeyboardSaveRestoreOpenGLState \ $CompatibilityHacksProperUsageOfSDL_UpdateRects \ - $UseGlshimCFlags \ + $UseGl4esCFlags \ $GLESVersion^" | \ sed "s^APPLICATION_SUBDIRS_BUILD :=.*^APPLICATION_SUBDIRS_BUILD := $AppSubdirsBuild^" | \ sed "s^APPLICATION_BUILD_EXCLUDE :=.*^APPLICATION_BUILD_EXCLUDE := $AppBuildExclude^" | \ diff --git a/project/jni/SettingsTemplate.mk b/project/jni/SettingsTemplate.mk index 851a50b87..6d19a5ebd 100644 --- a/project/jni/SettingsTemplate.mk +++ b/project/jni/SettingsTemplate.mk @@ -3,7 +3,7 @@ APP_MODULES := application sdl-1.2 sdl_main sdl_native_helpers jpeg png ogg flac vorbis freetype tremor ogg # To filter out static libs from all libs in makefile -APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread boost_locale glu icudata icutest icui18n icuio icule iculx icutu icuuc sdl_savepng android_support glshim nanogl +APP_AVAILABLE_STATIC_LIBS := jpeg png tremor freetype xerces ogg tremor vorbis flac boost_date_time boost_filesystem boost_iostreams boost_program_options boost_regex boost_signals boost_system boost_thread boost_locale glu icudata icutest icui18n icuio icule iculx icutu icuuc sdl_savepng android_support gl4es nanogl APP_ABI := armeabi @@ -46,7 +46,7 @@ APPLICATION_BUILD_EXCLUDE := APPLICATION_CUSTOM_BUILD_SCRIPT := -USE_GLSHIM := +USE_GL4ES := SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=LCTRL -DSDL_ANDROID_KEYCODE_1=LALT -DSDL_ANDROID_KEYCODE_2=SPACE -DSDL_ANDROID_KEYCODE_3=RETURN -DSDL_ANDROID_KEYCODE_4=RETURN diff --git a/project/jni/sdl-1.2/Android.mk b/project/jni/sdl-1.2/Android.mk index 39526b85c..7fcf7cb05 100644 --- a/project/jni/sdl-1.2/Android.mk +++ b/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 diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c b/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c index c3bd23a40..f867c8ce9 100644 --- a/project/jni/sdl-1.2/src/video/android/SDL_androidvideo-1.2.c +++ b/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 #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);