diff --git a/project/jni/application/ninslash/AndroidAppSettings.cfg b/project/jni/application/ninslash/AndroidAppSettings.cfg index df1a838a1..31c28af73 100644 --- a/project/jni/application/ninslash/AndroidAppSettings.cfg +++ b/project/jni/application/ninslash/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="Ninslash" AppFullName=ninslash.com # Application version code (integer) -AppVersionCode=01600 +AppVersionCode=01800 # Application user-visible version name (string) -AppVersionName="0.1.6.00" +AppVersionName="0.1.8.00" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -257,10 +257,10 @@ CompiledLibraries="sdl_image freetype glu" CustomBuildScript=n # Aditional CFLAGS for application -AppCflags='-O2 -flto -isystem jni/application/src/src/src/base/android' +AppCflags='-O2 -flto -Werror=format -isystem jni/application/src/src/src/base/android' # Aditional C++-specific compiler flags for application, added after AppCflags -AppCppflags='' +AppCppflags='-std=c++11' # Additional LDFLAGS for application AppLdflags='-lEGL -flto' diff --git a/project/jni/application/ninslash/reupload-data.sh b/project/jni/application/ninslash/reupload-data.sh new file mode 100755 index 000000000..736793bb3 --- /dev/null +++ b/project/jni/application/ninslash/reupload-data.sh @@ -0,0 +1,3 @@ +#!/bin/sh +adb shell rm /sdcard/Android/data/ninslash.com/files/libsdl-DownloadFinished-0.flag +adb shell rm /mnt/extSdCard/Android/data/ninslash.com/files/libsdl-DownloadFinished-0.flag diff --git a/project/jni/application/ninslash/src b/project/jni/application/ninslash/src index ec8223f1e..6ffdfe004 160000 --- a/project/jni/application/ninslash/src +++ b/project/jni/application/ninslash/src @@ -1 +1 @@ -Subproject commit ec8223f1e2f895cb852cc972b7e2fbde4d5a9b46 +Subproject commit 6ffdfe0045048f5c3c985276f0918126f3f0c65a diff --git a/project/jni/application/test-gles3/main.cpp b/project/jni/application/test-gles3/main.cpp index da013a9eb..77ed80043 100644 --- a/project/jni/application/test-gles3/main.cpp +++ b/project/jni/application/test-gles3/main.cpp @@ -154,11 +154,11 @@ static void initShaders() char *vertexShaderStr = NULL; asprintf( &vertexShaderStr, "#version 300 es \n" - "const mediump float screenWidthDiv = 2.0 / %d.0; \n" - "const mediump float screenHeightDiv = 2.0 / %d.0; \n" - "layout(location = 0) in mediump vec2 a_position; \n" - "layout(location = 1) in mediump vec2 a_texCoord; \n" - "out mediump vec2 v_texCoord; \n" + "const highp float screenWidthDiv = 2.0 / %d.0; \n" + "const highp float screenHeightDiv = 2.0 / %d.0; \n" + "layout(location = 0) in highp vec2 a_position; \n" + "layout(location = 1) in highp vec2 a_texCoord; \n" + "out highp vec2 v_texCoord; \n" "void main() \n" "{ \n" " gl_Position = vec4( \n" @@ -171,7 +171,7 @@ static void initShaders() const char *fragmentShaderStr = "#version 300 es \n" - "in mediump vec2 v_texCoord; \n" + "in highp vec2 v_texCoord; \n" "layout(location = 0) out lowp vec4 outColor; \n" "uniform sampler2D s_texture; \n" "void main() \n"