From f3a2be6abf0fc0c21bfa7c2ea45a3748db6bf3c3 Mon Sep 17 00:00:00 2001 From: l3iggs Date: Sun, 17 Aug 2014 21:27:53 -0700 Subject: [PATCH 1/2] [Android] allow for variable NDK header version --- android/phoenix/jni/Application.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/phoenix/jni/Application.mk b/android/phoenix/jni/Application.mk index 2466e00247..e86c6a1747 100644 --- a/android/phoenix/jni/Application.mk +++ b/android/phoenix/jni/Application.mk @@ -1,6 +1,6 @@ ifeq ($(GLES),3) - APP_PLATFORM := android-18 + APP_PLATFORM := $(NDK_GL_HEADER_VER) else - APP_PLATFORM := android-9 + APP_PLATFORM := $(NDK_NO_GL_HEADER_VER) endif APP_ABI := armeabi-v7a mips x86 From a1ed67f6e83db511419892f78e5e826cbb6f56f5 Mon Sep 17 00:00:00 2001 From: l3iggs Date: Mon, 18 Aug 2014 08:40:12 -0700 Subject: [PATCH 2/2] (Android) set APP_PLATFORM defaults in case not compiling from libretro-super --- android/phoenix/jni/Application.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/android/phoenix/jni/Application.mk b/android/phoenix/jni/Application.mk index f332ad4667..f16169ec36 100644 --- a/android/phoenix/jni/Application.mk +++ b/android/phoenix/jni/Application.mk @@ -1,7 +1,15 @@ ifeq ($(GLES),3) - APP_PLATFORM := $(NDK_GL_HEADER_VER) + ifndef NDK_GL_HEADER_VER + APP_PLATFORM := android-18 + else + APP_PLATFORM := $(NDK_GL_HEADER_VER) + endif else - APP_PLATFORM := $(NDK_NO_GL_HEADER_VER) + ifndef NDK_NO_GL_HEADER_VER + APP_PLATFORM := android-9 + else + APP_PLATFORM := $(NDK_NO_GL_HEADER_VER) + endif endif ifndef TARGET_ABIS