diff options
| author | Autechre | 2020-12-26 19:36:03 +0100 |
|---|---|---|
| committer | GitHub | 2020-12-26 19:36:03 +0100 |
| commit | a11ddce1b40d7e7d3978ddcfdbbff4c263b60069 (patch) | |
| tree | 52dd073cef28f4c6f6931f19ba70f67e5ee5a1aa | |
| parent | 3d985519636cc69dd1c2b86cab66ef88d6b20bfa (diff) | |
| parent | 14f55d927385290d76b19e7e931bd7a566b163d8 (diff) | |
| download | pcsx_rearmed-a11ddce1b40d7e7d3978ddcfdbbff4c263b60069.tar.gz pcsx_rearmed-a11ddce1b40d7e7d3978ddcfdbbff4c263b60069.tar.bz2 pcsx_rearmed-a11ddce1b40d7e7d3978ddcfdbbff4c263b60069.zip | |
Merge pull request #483 from webgeek1234/master
Android Updates
| -rw-r--r-- | jni/Android.mk | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 3f7db16..eabe464 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -180,13 +180,11 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) SOURCES_C += $(DYNAREC_DIR)/backends/psx/emu_if.c else ifeq ($(TARGET_ARCH_ABI),armeabi) COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI - COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__" SOURCES_ASM += $(UNAI_DIR)/gpu_arm.S \ $(FRONTEND_DIR)/cspace_arm.S SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp else COREFLAGS += -DUSE_GPULIB=1 -DGPU_UNAI - COREFLAGS += -DINLINE="static __inline__" -Dasm="__asm__ __volatile__" SOURCES_C += $(UNAI_DIR)/gpulib_if.cpp endif @@ -210,8 +208,5 @@ LOCAL_ARM_MODE := arm ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) LOCAL_ARM_NEON := true endif -ifeq ($(TARGET_ARCH),arm) - LOCAL_LDLIBS += -Wl,-no-warn-shared-textrel -endif include $(BUILD_SHARED_LIBRARY) |