aboutsummaryrefslogtreecommitdiff
path: root/jni/Android.mk
diff options
context:
space:
mode:
authornotaz2013-02-08 02:05:48 +0200
committernotaz2013-02-08 02:05:48 +0200
commitc82f907a99f7d0d3071471489d247f4b4394a8b7 (patch)
treef807cdc8edf8a83086d6eee32b04428ac91dd2f0 /jni/Android.mk
parent955f9af0395a7fa2bba0d1c3a4e6ef5d3e111dae (diff)
downloadpcsx_rearmed-c82f907a99f7d0d3071471489d247f4b4394a8b7.tar.gz
pcsx_rearmed-c82f907a99f7d0d3071471489d247f4b4394a8b7.tar.bz2
pcsx_rearmed-c82f907a99f7d0d3071471489d247f4b4394a8b7.zip
move cspace back to frontend
plugins no longer depend on it
Diffstat (limited to 'jni/Android.mk')
-rw-r--r--jni/Android.mk10
1 files changed, 6 insertions, 4 deletions
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