Android: fix compilation libpng-1.6.37 (missing arm/palette_neon_intr…

…insics.c) undefined reference to `png_riffle_palette_neon' undefined reference to `png_do_expand_palette_rgba8_neon' undefined reference to `png_do_expand_palette_rgb8_neon'
libsdl-org · Jun 20, 2019 · ab2a9c6 · ab2a9c6
1 parent 866a053
commit ab2a9c6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/external/libpng-1.6.37.patch b/external/libpng-1.6.37.patch
@@ -13,15 +13,15 @@ diff -ruN libpng-1.6.37.orig/Android.mk libpng-1.6.37/Android.mk
 +
 +ifeq ($(TARGET_ARCH_ABI),armeabi)
 +common_SRC_FILES += \
-+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
 +endif
 +ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 +common_SRC_FILES += \
-+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_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
++	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
 +endif
 +
 +common_CFLAGS := ## -fomit-frame-pointer

diff --git a/external/libpng-1.6.37/Android.mk b/external/libpng-1.6.37/Android.mk
@@ -9,15 +9,15 @@ common_SRC_FILES := \
 
 ifeq ($(TARGET_ARCH_ABI),armeabi)
 common_SRC_FILES += \
-	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
 endif
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 common_SRC_FILES += \
-	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c
+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_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
+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
 endif
 
 common_CFLAGS := ## -fomit-frame-pointer