diff options
| author | twinaphex | 2013-02-09 10:05:21 +0100 |
|---|---|---|
| committer | twinaphex | 2013-02-09 10:05:21 +0100 |
| commit | ad72cb33d8ef068b92a059a774dd7871d052a707 (patch) | |
| tree | f8623af5beeb8939631acceb2acb505c9497f71c /jni | |
| parent | 2dfdc938c99783e187f60c1d13db73e0ee434c92 (diff) | |
| parent | d57557c0644f9294e30657f0c7cf673cf2914695 (diff) | |
| download | pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.tar.gz pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.tar.bz2 pcsx_rearmed-ad72cb33d8ef068b92a059a774dd7871d052a707.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 06b4379..81962e0 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -29,14 +29,17 @@ 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 + LOCAL_SRC_FILES += ../frontend/cspace_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 +57,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 +87,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 |