From 2b7c2a71858122ca3205a69031cb8bb4e785910d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 14 Oct 2013 11:22:20 +0200
Subject: [PATCH] (Android Phoenix) Add mupen64 entry to libretro_cores.cfg

---
 android/phoenix/assets/libretro_cores.cfg                      | 3 +++
 android/phoenix/libs/appcompat/.classpath                      | 2 +-
 .../libs/appcompat/gen/android/support/v7/appcompat/R.java     | 2 +-
 android/phoenix/libs/appcompat/project.properties              | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/phoenix/assets/libretro_cores.cfg b/android/phoenix/assets/libretro_cores.cfg
index 649b3de473..ee10b05d06 100644
--- a/android/phoenix/assets/libretro_cores.cfg
+++ b/android/phoenix/assets/libretro_cores.cfg
@@ -87,3 +87,6 @@ libretro_bsnes_performance_system = "Nintendo SNES"
 
 libretro_dinothawr = "Dinothawr"
 libretro_dinothawr_system = "Puzzle Game"
+
+libretro_mupen64_plus = "Mupen64 Plus"
+libretro_mupen64_plus_system = "Nintendo 64"
diff --git a/android/phoenix/libs/appcompat/.classpath b/android/phoenix/libs/appcompat/.classpath
index 6de8da7ea9..fb2265b75e 100644
--- a/android/phoenix/libs/appcompat/.classpath
+++ b/android/phoenix/libs/appcompat/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/android-support-v7-appcompat.jar"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/android/phoenix/libs/appcompat/gen/android/support/v7/appcompat/R.java b/android/phoenix/libs/appcompat/gen/android/support/v7/appcompat/R.java
index fcd677aec4..3e8221a2cf 100644
--- a/android/phoenix/libs/appcompat/gen/android/support/v7/appcompat/R.java
+++ b/android/phoenix/libs/appcompat/gen/android/support/v7/appcompat/R.java
@@ -2358,7 +2358,7 @@ containing a value of this type.
          */
         public static final int[] MenuView = {
             0x010100ae, 0x0101012c, 0x0101012d, 0x0101012e,
-            0x0101012f, 0x01010130, 0x01010131, 0x010103f8
+            0x0101012f, 0x01010130, 0x01010131, 0x0101040c
         };
         /**
           <p>
diff --git a/android/phoenix/libs/appcompat/project.properties b/android/phoenix/libs/appcompat/project.properties
index dfa4dd0977..484dab0753 100644
--- a/android/phoenix/libs/appcompat/project.properties
+++ b/android/phoenix/libs/appcompat/project.properties
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-17
 android.library=true