From 566a5ebb9c01d1624764be8979b578393067a88c Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Wed, 6 Mar 2013 01:57:30 +0100
Subject: [PATCH] Move FBO enums to gl_common.h

---
 android/native/jni/input_autodetect.c |  2 ++
 console/rarch_console_video.h         |  6 ------
 gfx/gl_common.h                       | 10 ++++++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/android/native/jni/input_autodetect.c b/android/native/jni/input_autodetect.c
index c056474fa6..6e0dbd3925 100644
--- a/android/native/jni/input_autodetect.c
+++ b/android/native/jni/input_autodetect.c
@@ -225,6 +225,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          keycode_lut[AKEYCODE_BUTTON_10] |= ((RETRO_DEVICE_ID_JOYPAD_START+1)   << shift);
 
          /* TODO - unsure about pad 2 still */
+#if 0
          keycode_lut[AKEYCODE_BUTTON_Z]  |=  ((RETRO_DEVICE_ID_JOYPAD_UP+1)      << shift);
          keycode_lut[AKEYCODE_BUTTON_Y]  |=  ((RETRO_DEVICE_ID_JOYPAD_DOWN+1)      << shift);
          keycode_lut[AKEYCODE_BUTTON_C]  |=  ((RETRO_DEVICE_ID_JOYPAD_LEFT+1)      << shift);
@@ -240,6 +241,7 @@ void input_autodetect_setup (void *data, char *msg, size_t sizeof_msg, unsigned
          keycode_lut[AKEYCODE_BUTTON_B]  |=  ((RETRO_DEVICE_ID_JOYPAD_R2+1)     << shift);
          keycode_lut[AKEYCODE_BUTTON_C]  |=  ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift);
          keycode_lut[AKEYCODE_BUTTON_X] |= ((RETRO_DEVICE_ID_JOYPAD_START+1)   << shift);
+#endif
       }
       else if (strstr(name_buf, "TOMMO NEOGEOX Arcade Stick"))
       {
diff --git a/console/rarch_console_video.h b/console/rarch_console_video.h
index c538b1629d..1b2a39e181 100644
--- a/console/rarch_console_video.h
+++ b/console/rarch_console_video.h
@@ -25,12 +25,6 @@
 #define MAX_SCALING_FACTOR (2.0f)
 #endif
 
-enum
-{
-   FBO_DEINIT = 0,
-   FBO_INIT,
-   FBO_REINIT
-};
 
 enum aspect_ratio
 {
diff --git a/gfx/gl_common.h b/gfx/gl_common.h
index b7db8c3d59..1b3b4b2c73 100644
--- a/gfx/gl_common.h
+++ b/gfx/gl_common.h
@@ -56,6 +56,7 @@
 #include <GL/glext.h>
 #endif
 
+
 #if defined(ANDROID) && defined(HAVE_GRIFFIN)
 #include "../console/griffin/hook_context.h"
 #else
@@ -163,6 +164,15 @@ enum gl_scale_type
    RARCH_SCALE_VIEWPORT
 };
 
+#ifdef HAVE_FBO
+enum fbo_option
+{
+   FBO_DEINIT = 0,
+   FBO_INIT,
+   FBO_REINIT
+};
+#endif
+
 struct gl_fbo_scale
 {
    enum gl_scale_type type_x;