From 82d2ee63dc9ac18e7a21944a526f31b8cfb0cf99 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 15 Oct 2012 19:09:37 +0200 Subject: [PATCH] (Android) Move g_android outside of general.h --- android/native/jni/android-general.h | 36 ++++++++++++++++++++++++ android/native/jni/main.c | 7 +---- general.h | 42 +++------------------------- 3 files changed, 41 insertions(+), 44 deletions(-) create mode 100644 android/native/jni/android-general.h diff --git a/android/native/jni/android-general.h b/android/native/jni/android-general.h new file mode 100644 index 0000000000..0c7296551a --- /dev/null +++ b/android/native/jni/android-general.h @@ -0,0 +1,36 @@ +#ifndef _ANDROID_GENERAL_H +#define _ANDROID_GENERAL_H + +#include +#include + +#include +#include + +struct saved_state +{ + float angle; + int32_t x; + int32_t y; +}; + +struct droid +{ + struct android_app* app; + + ASensorManager* sensorManager; + const ASensor* accelerometerSensor; + ASensorEventQueue* sensorEventQueue; + + int animating; + EGLDisplay display; + EGLSurface surface; + EGLContext context; + int32_t width; + int32_t height; + struct saved_state state; +}; + +extern struct droid g_android; + +#endif diff --git a/android/native/jni/main.c b/android/native/jni/main.c index 4f3b598e99..0b81225aa7 100644 --- a/android/native/jni/main.c +++ b/android/native/jni/main.c @@ -18,12 +18,7 @@ #include #include -#include -#include - -#include -#include - +#include "android-general.h" #include "../../../general.h" JNIEXPORT jint JNICALL JNI_OnLoad( JavaVM *vm, void *pvt) diff --git a/general.h b/general.h index 607ae5507b..87fd56a02d 100644 --- a/general.h +++ b/general.h @@ -41,6 +41,10 @@ #include