diff options
| author | Maksim <MoNTE48@mail.ua> | 2020-04-22 20:03:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-22 20:03:46 +0200 |
| commit | 6ba44d74526031a07bbc5093b708b8b99a27456a (patch) | |
| tree | fa6535be1818c963c7cb0256ac3a683fe3415232 /build/android | |
| parent | 5355cb1d87f60bc5548a8a9311e597b9c6046013 (diff) | |
| download | minetest-6ba44d74526031a07bbc5093b708b8b99a27456a.tar.gz minetest-6ba44d74526031a07bbc5093b708b8b99a27456a.tar.bz2 minetest-6ba44d74526031a07bbc5093b708b8b99a27456a.zip | |
Android: add OpenGL ES 2 support (#9715)
.. and bump gradle to 3.6.3
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/app/build.gradle | 9 | ||||
| -rw-r--r-- | build/android/build.gradle | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/build/android/app/build.gradle b/build/android/app/build.gradle index 6a34a6d70..9d14cdab8 100644 --- a/build/android/app/build.gradle +++ b/build/android/app/build.gradle @@ -63,8 +63,12 @@ task prepareAssets() { copy { from "${projRoot}/builtin" into "${assetsFolder}/builtin" } - copy { + /*copy { + // ToDo: fix Minetest shaders that currently don't work with OpenGL ES from "${projRoot}/client/shaders" into "${assetsFolder}/client/shaders" + }*/ + copy { + from "../native/deps/Android/Irrlicht/shaders" into "${assetsFolder}/client/shaders/Irrlicht" } copy { from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts" @@ -73,8 +77,7 @@ task prepareAssets() { from "${projRoot}/games/${gameToCopy}" into "${assetsFolder}/games/${gameToCopy}" } /*copy { - // locales broken right now - // ToDo: fix it! + // ToDo: fix broken locales from "${projRoot}/po" into "${assetsFolder}/po" }*/ copy { diff --git a/build/android/build.gradle b/build/android/build.gradle index b02e8c6df..c4de09bf8 100644 --- a/build/android/build.gradle +++ b/build/android/build.gradle @@ -15,7 +15,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:3.6.3' classpath 'org.ajoberstar.grgit:grgit-gradle:4.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files |