Merge pull request #885 from l3iggs/patch-1

[Android] allow for variable NDK header version
2014-08-18 20:13:09 +02:00 · 2014-08-18 20:13:09 +02:00 · 77093f7ebe
parent a15fe6271e a1ed67f6e8
commit 77093f7ebe
1 changed files with 10 additions and 2 deletions
--- a/android/phoenix/jni/Application.mk
+++ b/android/phoenix/jni/Application.mk
@ -1,7 +1,15 @@
 ifeq ($(GLES),3)
-   APP_PLATFORM := android-18
+   ifndef NDK_GL_HEADER_VER
+      APP_PLATFORM := android-18
+   else
+      APP_PLATFORM := $(NDK_GL_HEADER_VER)
+   endif
 else
-   APP_PLATFORM := android-9
+   ifndef NDK_NO_GL_HEADER_VER
+      APP_PLATFORM := android-9
+   else
+      APP_PLATFORM := $(NDK_NO_GL_HEADER_VER)
+   endif
 endif

 ifndef TARGET_ABIS