notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Fixed building for arm64 (iOS)"
[pcsx_rearmed.git]
/
jni
/
Android.mk
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
81b885d
..
9dd9e39
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-2,8
+2,16
@@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
include $(CLEAR_VARS)
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+ LOCAL_CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
+
APP_DIR := ../../src
APP_DIR := ../../src
+#fix stupid change in ndk r11 that breaks compiling even when the exe would run fine
+LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
+
ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
NO_NEON_BUILD := 1
else
ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
NO_NEON_BUILD := 1
else
@@
-19,30
+27,27
@@
endif
ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
ifeq ($(TARGET_ARCH),arm)
LOCAL_ARM_MODE := arm
- ifeq ($(TARGET_ARCH_EABI),armeabi-v7a)
- LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=1
- else
- LOCAL_CFLAGS += -Wa,--defsym,HAVE_ARMV7=0
- endif
-
LOCAL_CFLAGS += -DANDROID_ARM
LOCAL_CFLAGS += -DANDROID_ARM
- LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.
s
+ LOCAL_SRC_FILES += ../libpcsxcore/gte_arm.
S
# dynarec
# dynarec
- LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/
linkage_arm.S ../libpcsxcore/new_dynarec/emu_if.c ../libpcsxcore/new_dynarec
/pcsxmem.c
+ LOCAL_SRC_FILES += ../libpcsxcore/new_dynarec/new_dynarec.c ../libpcsxcore/new_dynarec/
arm/linkage_arm.S ../libpcsxcore/new_dynarec/backends/psx/emu_if.c ../libpcsxcore/new_dynarec/backends/psx
/pcsxmem.c
# spu
LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S
# spu
LOCAL_SRC_FILES += ../plugins/dfsound/arm_utils.S
+ # misc
+
ifeq ($(NO_NEON_BUILD),1)
# gpu
LOCAL_CFLAGS += -DREARMED
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
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
# gpu
LOCAL_SRC_FILES += ../plugins/gpu_neon/psx_gpu_if.c ../plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S
@@
-60,7
+65,7
@@
endif
ifneq ($(TARGET_ARCH),arm)
# gpu
LOCAL_CFLAGS += -DREARMED
ifneq ($(TARGET_ARCH),arm)
# gpu
LOCAL_CFLAGS += -DREARMED
- LOCAL_SRC_FILES += ../plugins/gpu
lib/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_))
endif
$(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_))
@@
-89,16
+94,14
@@
LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c
# dfinput
LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c
# dfinput
LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c
-# gui
-LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c
-LOCAL_SRC_FILES += ../frontend/common/fonts.c
-LOCAL_SRC_FILES += ../frontend/linux/plat.c
+# misc
+LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c ../frontend/cspace.c
# libretro
LOCAL_SRC_FILES += ../frontend/libretro.c
# libretro
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_CFLAGS += -O3 -ffast-math -funroll-loops -DNDEBUG -D_FILE_OFFSET_BITS=64 -DHAVE_LIBRETRO -DNO_FRONTEND
-DFRONTEND_SUPPORTS_RGB565 -DANDROID
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../
include
LOCAL_LDLIBS := -lz -llog
include $(BUILD_SHARED_LIBRARY)
LOCAL_LDLIBS := -lz -llog
include $(BUILD_SHARED_LIBRARY)