Fixed building Android arm64-v8a architecture with NDK r18

libsdl-org · Oct 12, 2018 · e636f8d · e636f8d
1 parent b6d3bee
commit e636f8d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/external/libpng-1.6.32.patch b/external/libpng-1.6.32.patch
@@ -1,7 +1,7 @@
 diff -ruN libpng-1.6.32.orig/Android.mk libpng-1.6.32/Android.mk
 --- libpng-1.6.32.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
 +++ libpng-1.6.32/Android.mk	2018-10-01 20:26:46.000000000 -0700
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,41 @@
 +LOCAL_PATH:= $(call my-dir)
 +
 +include $(CLEAR_VARS)
@@ -19,6 +19,10 @@ diff -ruN libpng-1.6.32.orig/Android.mk libpng-1.6.32/Android.mk
 +common_SRC_FILES += \
 +	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
 +endif
++ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
++common_SRC_FILES += \
++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
++endif
 +
 +common_CFLAGS := ## -fomit-frame-pointer
 +

diff --git a/external/libpng-1.6.32/Android.mk b/external/libpng-1.6.32/Android.mk
@@ -15,6 +15,10 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 common_SRC_FILES += \
 	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
 endif
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+common_SRC_FILES += \
+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
+endif
 
 common_CFLAGS := ## -fomit-frame-pointer