From c82f907a99f7d0d3071471489d247f4b4394a8b7 Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 8 Feb 2013 02:05:48 +0200
Subject: move cspace back to frontend

plugins no longer depend on it
---
 jni/Android.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 06b4379..05a92d4 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -29,14 +29,16 @@ ifeq ($(TARGET_ARCH),arm)
    # spu
    LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S
 
+   # misc
+
    ifeq ($(NO_NEON_BUILD),1)
       # gpu
       LOCAL_CFLAGS += -DREARMED
-      LOCAL_SRC_FILES += ../plugins/gpulib/cspace.c ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s
+      LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s
    else
       LOCAL_ARM_NEON := true
       LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
-      LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../plugins/gpulib/cspace_neon.s
+      LOCAL_SRC_FILES += ../libpcsxcore/gte_neon.S ../frontend/cspace_neon.s
 
       # gpu
       LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S
@@ -54,7 +56,7 @@ endif
 ifneq ($(TARGET_ARCH),arm)
    # gpu
    LOCAL_CFLAGS += -DREARMED
-   LOCAL_SRC_FILES += ../plugins/gpulib/cspace.c ../plugins/gpu_unai/gpulib_if.cpp
+   LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp
 endif
 
 $(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
@@ -84,7 +86,7 @@ LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c
 LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c
 
 # misc
-LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c
+LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c ../frontend/cspace.c
 
 # libretro
 LOCAL_SRC_FILES += ../frontend/libretro.c
-- 
cgit v1.2.3


From d57557c0644f9294e30657f0c7cf673cf2914695 Mon Sep 17 00:00:00 2001
From: notaz
Date: Fri, 8 Feb 2013 02:13:03 +0200
Subject: frontend: add armv6 color space converter

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

(limited to 'jni')

diff --git a/jni/Android.mk b/jni/Android.mk
index 05a92d4..81962e0 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -35,6 +35,7 @@ ifeq ($(TARGET_ARCH),arm)
       # gpu
       LOCAL_CFLAGS += -DREARMED
       LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp ../plugins/gpu_unai/gpu_arm.s
+      LOCAL_SRC_FILES += ../frontend/cspace_arm.S
    else
       LOCAL_ARM_NEON := true
       LOCAL_CFLAGS += -DNEON_BUILD -DTEXTURE_CACHE_4BPP -DTEXTURE_CACHE_8BPP
-- 
cgit v1.2.3