projects
/
andemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
android builds now include both 64 and 32bit in the APK
[andemo]
/
libs
/
treestore
/
Makefile
diff --git
a/libs/treestore/Makefile
b/libs/treestore/Makefile
index
cb9f7b3
..
c489fff
100644
(file)
--- a/
libs/treestore/Makefile
+++ b/
libs/treestore/Makefile
@@
-8,10
+8,16
@@
ifeq ($(sys), mingw)
endif
ifeq ($(sys), android-arm64)
obj = treestore.arm64.o text.arm64.o dynarr.arm64.o
endif
ifeq ($(sys), android-arm64)
obj = treestore.arm64.o text.arm64.o dynarr.arm64.o
- lib = ../android/libtreestore.a
+ lib = ../android64/libtreestore.a
+ pic = -fPIC
+endif
+ifeq ($(sys), android-arm32)
+ obj = treestore.arm32.o text.arm32.o dynarr.arm32.o
+ lib = ../android32/libtreestore.a
+ pic = -fPIC
endif
endif
-CFLAGS = -O3
+CFLAGS = -O3 $(pic)
$(lib): $(obj)
$(AR) rcs $@ $(obj)
$(lib): $(obj)
$(AR) rcs $@ $(obj)
@@
-19,6
+25,9
@@
$(lib): $(obj)
%.arm64.o: %.c
$(CC) -o $@ $(CFLAGS) -c $<
%.arm64.o: %.c
$(CC) -o $@ $(CFLAGS) -c $<
+%.arm32.o: %.c
+ $(CC) -o $@ $(CFLAGS) -c $<
+
%.w32.o: %.c
$(CC) -o $@ $(CFLAGS) -c $<
%.w32.o: %.c
$(CC) -o $@ $(CFLAGS) -c $<