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

Ninslash: fixed compilation

Browse Source
This commit is contained in:
Sergii Pylypenko
2016-09-15 23:36:51 +03:00
parent 12af247a77
commit fca818e838
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/jni/application/ninslash/AndroidAppSettings.cfg
View File

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

3
project/jni/application/ninslash/reupload-data.sh Executable file
View File

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

2
project/jni/application/ninslash/src

Submodule project/jni/application/ninslash/src updated: ec8223f1e2...6ffdfe0045

12
project/jni/application/test-gles3/main.cpp
View File

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