preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-11 05:26:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7001 from i25ffz/master

Browse Source 
Compatibility ndk r9d armeabi-v7a-hard APP_ABI building.
This commit is contained in:
Henrik Rydgård committed 2014-10-15 20:32:06 +02:00
2 parents 54a87800d3 b8d6a64f7a
commit c329236f96
2 files changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

android/jni/Android.mk
+2 -1
View File
@@ -51,7 +51,8 @@ ARCH_FILES := \
$(SRC)/GPU/Common/VertexDecoderX86.cpp
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
ARCH_FILES := \
$(SRC)/GPU/Common/TextureDecoderNEON.cpp.neon \
$(SRC)/Common/ArmEmitter.cpp \
android/jni/Locals.mk
+2 -1
View File
@@ -17,7 +17,8 @@ LOCAL_C_INCLUDES := \
LOCAL_STATIC_LIBRARIES := native libzip
LOCAL_LDLIBS := -lz -lGLESv2 -lEGL -ldl -llog
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
# ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(findstring armeabi-v7a,$(TARGET_ARCH_ABI)),armeabi-v7a)
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavformat.a
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libavcodec.a
LOCAL_LDLIBS += $(LOCAL_PATH)/../../ffmpeg/android/armv7/lib/libswresample.a