android builds now include both 64 and 32bit in the APK

[andemo] / libs / imago / Makefile

diff --git a/libs/imago/Makefile b/libs/imago/Makefile
index dd951db..f9c1757 100644 (file)
--- a/libs/imago/Makefile
+++ b/libs/imago/Makefile
@@ -12,10 +12,16 @@ ifeq ($(sys), mingw)
 endif
 ifeq ($(sys), android-arm64)
        obj = $(src:.c=.arm64.o)
-       alib = ../android/libimago.a
+       alib = ../android64/libimago.a
+       pic = -fPIC
+endif
+ifeq ($(sys), android-arm32)
+       obj = $(src:.c=.arm32.o)
+       alib = ../android32/libimago.a
+       pic = -fPIC
 endif
 
-CFLAGS = -O3 -Izlib -Ilibpng -Ijpeglib
+CFLAGS = -O3 -Izlib -Ilibpng -Ijpeglib $(pic)
 
 $(alib): $(obj)
        $(AR) rcs $@ $(obj)
@@ -23,6 +29,9 @@ $(alib): $(obj)
 %.arm64.o: %.c
        $(CC) -o $@ $(CFLAGS) -c $<
 
+%.arm32.o: %.c
+       $(CC) -o $@ $(CFLAGS) -c $<
+
 %.w32.o: %.c
        $(CC) -o $@ $(CFLAGS) -c $<