diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-02-22 22:29:57 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2014-02-22 22:29:57 -0600 |
| commit | 60a5d8900bd2bf63e4af32d60ec7f69053e13297 (patch) | |
| tree | 830fbb2a8b0d23066a88be8f128d98edbbd5b09a /Source/Core | |
| parent | 311caef094c434cea6770f8230a7c39318a64def (diff) | |
| parent | 1f750904af5d2bd25467fea9dd79e22153cd2bb6 (diff) | |
Merge pull request #60 from Sonicadvance1/Android-GLDetect
Fix the Android OpenGL About tab.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/MainAndroid.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/MainAndroid.cpp b/Source/Core/DolphinWX/MainAndroid.cpp index 3d3b052a09..23c6014333 100644 --- a/Source/Core/DolphinWX/MainAndroid.cpp +++ b/Source/Core/DolphinWX/MainAndroid.cpp @@ -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; |