SDL: added GLES3 support

project/jni/application/ninslash/AndroidAppSettings.cfg

@@ -46,9 +46,13 @@ NeedDepthBuffer=n
 # Enable OpenGL stencil buffer (needed only for 3-d applications, small speed decrease) (y) or (n)
 NeedStencilBuffer=n
 
-# Try to use GLES 2.x context - will revert to GLES 1.X if unsupported by device
+# Use GLES 2.x context
 # you need this option only if you're developing 3-d app (y) or (n)
-NeedGles2=y
+NeedGles2=n
+
+# Use GLES 3.x context
+# you need this option only if you're developing 3-d app (y) or (n)
+NeedGles3=y
 
 # Use glshim library for provide OpenGL 1.x functionality to OpenGL ES accelerated cards (y) or (n)
 UseGlshim=
@@ -253,7 +257,7 @@ CompiledLibraries="sdl_image freetype glu"
 CustomBuildScript=n
 
 # Aditional CFLAGS for application
-AppCflags='-O2 -flto'
+AppCflags='-O2 -flto -isystem jni/application/src/src/src/base/android'
 
 # Aditional C++-specific compiler flags for application, added after AppCflags
 AppCppflags=''
@@ -265,7 +269,7 @@ AppLdflags='-lEGL -flto'
 AppOverlapsSystemHeaders=n
 
 # Build only following subdirs (empty will build all dirs, ignored with custom script)
-AppSubdirsBuild='src/src src/src/base/system.c src/src/engine src/src/engine/client src/src/engine/shared src/src/engine/external/pnglite src/src/engine/external/wavpack src/src/engine/external/json-parser src/src/game src/src/game/client/* src/src/game/editor src/src/game/generated/protocol.cpp src/src/game/generated/client_data.cpp'
+AppSubdirsBuild='src/src src/src/base/android src/src/base/system.c src/src/engine src/src/engine/client src/src/engine/shared src/src/engine/external/pnglite src/src/engine/external/wavpack src/src/engine/external/json-parser src/src/game src/src/game/client/* src/src/game/editor src/src/game/generated/protocol.cpp src/src/game/generated/client_data.cpp'
 
 # Exclude these files from build
 AppBuildExclude=''

project/jni/application/ninslash/AndroidPreBuild.sh

@@ -28,7 +28,7 @@ zip -r ../AndroidData/data.zip data *.txt *.cfg >/dev/null
 
 for ARCH in armeabi-v7a x86; do
 	[ -e ../AndroidData/binaries-$ARCH.zip ] && continue
-	rm -rf teeworlds_srv
+	rm -rf ninslash_srv
 	mkdir -p objs
 	# server-sources.txt generated by running bam server_release 2>&1 | tee build.log
 	# and parsing logs with grep -o ' [^ ]*[.]cp\?p\?' build.log | grep -v /zlib/ > ../server-sources.txt
@@ -47,13 +47,13 @@ for ARCH in armeabi-v7a x86; do
 		$CXX $CFLAGS -fno-exceptions -fno-rtti $OBJS $LDFLAGS -pie -flto -pthread -o ninslash_srv || exit 1
 		$STRIP --strip-unneeded ninslash_srv
 		' || exit 1
-	mkdir -p bin-$ARCH
-	cp ninslash_srv bin-$ARCH/
-	cd bin-$ARCH
-	zip ../../AndroidData/binaries-$ARCH.zip *
-	cd ..
+	mkdir -p bin/$ARCH
+	mv -f ninslash_srv bin/$ARCH/
+	cd bin/$ARCH
+	zip ../../../AndroidData/binaries-$ARCH.zip *
+	cd ../..
 done
 
-cp -f logo.png ../AndroidData/
+ln -s ../src/logo.png ../AndroidData/
 
 exit 0