From 7bec5ddb55f8fa4823e69ebffa87066e577eeae6 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Mon, 17 Sep 2012 02:40:34 +0200 Subject: [PATCH] (Android) Add Android Makefile + commit auo-generated com_retroarch_rruntime.h header --- Makefile.android | 22 +++++++ android/bifrost.c | 18 +++--- android/com_retroarch_rruntime.h | 77 +++++++++++++++++++++++++ android/src/com/retroarch/rruntime.java | 8 +-- 4 files changed, 112 insertions(+), 13 deletions(-) create mode 100644 Makefile.android create mode 100644 android/com_retroarch_rruntime.h diff --git a/Makefile.android b/Makefile.android new file mode 100644 index 0000000000..7f990e9bf5 --- /dev/null +++ b/Makefile.android @@ -0,0 +1,22 @@ +### +## +# Makefile for RetroArch Android. +## + +all: + ndk-build + +clean: + ndk-build clean + +headers: + javah -o android/com_retroarch_rruntime.h -classpath android/bin/classes com.retroarch.rruntime + +install: + adb install retroarch-android.apk + +uninstall: + adb uninstall com.retroarch + +test_shader: + cgc -ogles -profile glslf $(FILE) diff --git a/android/bifrost.c b/android/bifrost.c index 4b8ba57195..99217bbb7e 100644 --- a/android/bifrost.c +++ b/android/bifrost.c @@ -22,12 +22,14 @@ #include #include "../boolean.h" +#include "com_retroarch_rruntime.h" + #include "../console/rarch_console_main_wrap.h" #include "../console/rarch_console_rom_ext.h" #include "../console/rarch_console_settings.h" #include "../general.h" -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_load_game +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_load_1game (JNIEnv *env, jclass class, jstring j_path, jint j_extract_zip_mode) { jboolean is_copy = false; @@ -38,13 +40,13 @@ JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_load_game (*env)->ReleaseStringUTFChars(env, j_path, game_path); } -JNIEXPORT jboolean JNICALL Java_com_retroarch_RRuntime_run_frame +JNIEXPORT jboolean JNICALL Java_com_retroarch_rruntime_run_1frame (JNIEnv *env, jclass class) { return rarch_main_iterate(); } -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_startup +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_startup (JNIEnv *env, jclass class, jstring j_config_path) { bool retval = false; @@ -56,32 +58,32 @@ JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_startup (*env)->ReleaseStringUTFChars(env, j_config_path, config_path); } -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_deinit +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_deinit (JNIEnv *env, jclass class) { rarch_main_deinit(); } -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_load_state +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_load_1state (JNIEnv *env, jclass class) { rarch_load_state(); } -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_save_state +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_save_1state (JNIEnv *env, jclass class) { rarch_save_state(); } -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_settings_change +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1change (JNIEnv *env, jclass class, jint j_setting) { unsigned setting = j_setting; rarch_settings_change(setting); } -JNIEXPORT void JNICALL Java_com_retroarch_RRuntime_settings_set_defaults +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1set_1defaults (JNIEnv *env, jclass class) { rarch_settings_set_default(); diff --git a/android/com_retroarch_rruntime.h b/android/com_retroarch_rruntime.h new file mode 100644 index 0000000000..fe175336c4 --- /dev/null +++ b/android/com_retroarch_rruntime.h @@ -0,0 +1,77 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ +#include +/* Header for class com_retroarch_rruntime */ + +#ifndef _Included_com_retroarch_rruntime +#define _Included_com_retroarch_rruntime +#ifdef __cplusplus +extern "C" { +#endif +/* + * Class: com_retroarch_rruntime + * Method: load_game + * Signature: (Ljava/lang/String;I)V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_load_1game + (JNIEnv *, jclass, jstring, jint); + +/* + * Class: com_retroarch_rruntime + * Method: run_frame + * Signature: ()Z + */ +JNIEXPORT jboolean JNICALL Java_com_retroarch_rruntime_run_1frame + (JNIEnv *, jclass); + +/* + * Class: com_retroarch_rruntime + * Method: startup + * Signature: (Ljava/lang/String;)V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_startup + (JNIEnv *, jclass, jstring); + +/* + * Class: com_retroarch_rruntime + * Method: deinit + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_deinit + (JNIEnv *, jclass); + +/* + * Class: com_retroarch_rruntime + * Method: load_state + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_load_1state + (JNIEnv *, jclass); + +/* + * Class: com_retroarch_rruntime + * Method: save_state + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_save_1state + (JNIEnv *, jclass); + +/* + * Class: com_retroarch_rruntime + * Method: settings_change + * Signature: (I)V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1change + (JNIEnv *, jclass, jint); + +/* + * Class: com_retroarch_rruntime + * Method: settings_set_defaults + * Signature: ()V + */ +JNIEXPORT void JNICALL Java_com_retroarch_rruntime_settings_1set_1defaults + (JNIEnv *, jclass); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/android/src/com/retroarch/rruntime.java b/android/src/com/retroarch/rruntime.java index c3992ec418..3d16dd2d72 100644 --- a/android/src/com/retroarch/rruntime.java +++ b/android/src/com/retroarch/rruntime.java @@ -16,14 +16,14 @@ package com.retroarch; -public class RRuntime +public class rruntime { static { System.loadLibrary("retroarch"); } - private RRuntime() + private rruntime() { } @@ -32,9 +32,7 @@ public class RRuntime public static native boolean run_frame(); - public static native startup(String j_config_path); - - public static native int loadRom(final String fileName); + public static native void startup(String j_config_path); public static native void deinit();