From da710571b75db7031b82924ab3ad47eb645ce215 Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 30 Nov 2012 02:51:45 +0200
Subject: mave plugin and core shared includes to single location

---
 jni/Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 6be42b1..98f59f8 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -98,7 +98,7 @@ LOCAL_SRC_FILES += ../frontend/linux/plat.c
 LOCAL_SRC_FILES += ../frontend/libretro.c
 
 LOCAL_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../frontend
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../include
 LOCAL_LDLIBS := -lz -llog
 
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3


From 665f33e1e8ce2e40a7939a33075c3bce1c90790c Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 30 Nov 2012 02:53:25 +0200
Subject: improve ARM feature detection

---
 jni/Android.mk | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 98f59f8..60db810 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -19,12 +19,6 @@ endif
 ifeq ($(TARGET_ARCH),arm)
    LOCAL_ARM_MODE := arm
 
-   ifeq ($(TARGET_ARCH_EABI),armeabi-v7a)
-      LOCAL_CFLAGS += -DHAVE_ARMV7=1
-   else
-      LOCAL_CFLAGS += -DHAVE_ARMV7=0
-   endif
-
    LOCAL_CFLAGS += -DANDROID_ARM
 
    LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.S
-- 
cgit v1.2.3


From a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 2 Dec 2012 02:43:40 +0200
Subject: frontend: fix clean libretro build

---
 jni/Android.mk | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 60db810..89af335 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -83,10 +83,8 @@ LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c
 # dfinput
 LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c
 
-# gui
+# misc
 LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c
-LOCAL_SRC_FILES += ../frontend/common/fonts.c
-LOCAL_SRC_FILES += ../frontend/linux/plat.c
 
 # libretro
 LOCAL_SRC_FILES += ../frontend/libretro.c
-- 
cgit v1.2.3