Merge pull request #60 from Sonicadvance1/Android-GLDetect

Fix the Android OpenGL About tab.
This commit is contained in:
Ryan Houdek
2014-02-22 22:29:57 -06:00
6 changed files with 25 additions and 6 deletions

View File

@ -21,6 +21,7 @@
#include <jni.h>
#include <android/log.h>
#include <android/native_window_jni.h>
#include <EGL/egl.h>
#include "Android/ButtonManager.h"
#include "Common/Common.h"
@ -297,6 +298,11 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveScreenSh
Core::SaveScreenShot();
}
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_eglBindAPI(JNIEnv *env, jobject obj, jint api)
{
eglBindAPI(api);
}
JNIEXPORT jstring JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetConfig(JNIEnv *env, jobject obj, jstring jFile, jstring jKey, jstring jValue, jstring jDefault)
{
IniFile ini;