mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-14 01:19:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Cleanups

Browse Source
This commit is contained in:
twinaphex 2013-01-06 06:10:07 +01:00
parent 01a72eaeb7
commit f8160fb2bd
9 changed files with 10 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
android/native/jni/android_general.h
View File

@ -1,25 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2013 - Hans-Kristian Arntzen
* Copyright (C) 2011-2013 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _ANDROID_GENERAL_H
#define _ANDROID_GENERAL_H
#include "android_glue.h"
#include "../../../boolean.h"
extern struct android_app *g_android;
#endif

2
android/native/jni/android_glue.h
View File

@ -158,4 +158,6 @@ int8_t android_app_read_cmd (void *data);
extern void engine_app_read_cmd (void *data);
extern void engine_handle_cmd (void *data, int32_t cmd);
extern struct android_app *g_android;
#endif /* _ANDROID_NATIVE_APP_GLUE_H */

2
android/native/jni/input_android.c
View File

@ -16,7 +16,7 @@
#include <android/keycodes.h>
#include <unistd.h>
#include "android_general.h"
#include "android_glue.h"
#include "input_autodetect.h"
#include "../../../input/input_common.h"
#include "../../../performance.h"

3
android/native/jni/input_autodetect.c
View File

@ -14,7 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#include "android_general.h"
#include "android_glue.h"
#include "jni_macros.h"
#include "input_autodetect.h"
uint64_t keycode_lut[LAST_KEYCODE];

4
android/native/jni/jni_wrapper.h → android/native/jni/jni_macros.h
View File

@ -14,8 +14,8 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _JNI_WRAPPER_H
#define _JNI_WRAPPER_H
#ifndef _JNI_MACROS_H
#define _JNI_MACROS_H
#include <jni.h>

28
android/native/jni/jni_wrapper.c
View File

@ -1,28 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2013 - Hans-Kristian Arntzen
* Copyright (C) 2011-2013 - Daniel De Matteis
*
* RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version.
*
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with RetroArch.
* If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include "jni_wrapper.h"
#include "../../../retroarch_logger.h"
jint JNI_OnLoad(JavaVM *vm, void *reserved)
{
(void)reserved;
RARCH_LOG("JNI - Successfully executed JNI_OnLoad.\n");
return JNI_VERSION_1_4;
}

4
console/griffin/griffin.c
View File

@ -18,10 +18,6 @@
#include "../../msvc/msvc_compat.h"
#endif
#ifdef ANDROID
#include "../../android/native/jni/jni_wrapper.c"
#endif
/*============================================================
LOGGERS
============================================================ */

6
frontend/frontend_android.c
View File

@ -20,8 +20,8 @@
#include <string.h>
#include <sys/resource.h>
#include "../android/native/jni/android_general.h"
#include "../android/native/jni/jni_wrapper.h"
#include "../android/native/jni/android_glue.h"
#include "../android/native/jni/jni_macros.h"
#include "../general.h"
#include "../performance.h"
#include "../driver.h"
@ -248,8 +248,6 @@ static bool android_app_start_main(struct android_app *android_app, int *init_re
struct jni_params in_params;
struct jni_out_params_char out_args;
JNI_OnLoad(android_app->activity->vm, NULL);
in_params.java_vm = android_app->activity->vm;
in_params.class_obj = android_app->activity->clazz;

2
gfx/context/androidegl_ctx.c
View File

@ -20,7 +20,7 @@
#include <EGL/egl.h> /* Requires NDK r5 or newer */
#include "../../android/native/jni/android_general.h"
#include "../../android/native/jni/android_glue.h"
#include "../image.h"
#include "../fonts/gl_font.h"