miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UseGlshim option renamed to UseGl4es

Browse Source
This commit is contained in:
lubomyr
2016-11-06 16:35:14 +02:00
parent 4d9ac0505d
commit aa4b72349d
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
changeAppSettings.sh
View File

@@ -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^" | \

4
project/jni/SettingsTemplate.mk
View File

@@ -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

4
project/jni/sdl-1.2/Android.mk
View File

@@ -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

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

@@ -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);