demosystem

[andemo] / Makefile.android

diff --git a/Makefile.android b/Makefile.android
index 336d7c9..33a7851 100644 (file)
--- a/Makefile.android
+++ b/Makefile.android
@@ -6,7 +6,7 @@ PLATFORM_JAR = $(SDK)/platforms/android-23/android.jar
 TCPATH = $(NDK)/toolchains/llvm/prebuilt/linux-$(shell uname -m)/bin
 TC = $(TCPATH)/aarch64-linux-android23-
 
-src = $(wildcard src/*.c) $(wildcard src/android/*.c)
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/android/*.c)
 obj = $(src:.c=.arm64.o)
 dep = $(src:.c=.d)
 name = andemo
@@ -20,12 +20,15 @@ warn = -pedantic -Wall
 dbg = -g
 opt = -O3 -ffast-math -fno-strict-aliasing
 def = -DGLDEF
-incdir = -Isrc -Ilibs -Ilibs/imago/src
+incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/treestore
 libdir = -Llibs/android
 
+libs = libs/android/libimago.a libs/android/libtreestore.a libs/android/libanim.a \
+          libs/android/libpsys.a
+
 CC = $(TC)clang
 CFLAGS = $(CCSYSROOT) $(ISYS) $(warn) $(dbg) $(opt) $(def) $(incdir) -fPIC -fcommon -MMD
-LDFLAGS = $(LDSYSROOT) $(libdir) -lm -landroid -llog -lEGL -lGLESv2 -limago -lpsys -lanim
+LDFLAGS = $(LDSYSROOT) $(libdir) -lm -landroid -llog -lEGL -lGLESv2 -limago -lpsys -lanim -ltreestore
 
 $(name).apk: $(name).aligned.apk keystore.jks
        apksigner sign --ks keystore.jks --ks-key-alias androidkey --ks-pass pass:android --key-pass pass:android --out $@ $<
@@ -44,7 +47,7 @@ $(name).unsigned.apk: $(lib_so) AndroidManifest.xml
        cp -r sdr apkbuild/assets
        aapt package -f -F $@ -I $(PLATFORM_JAR) -M AndroidManifest.xml apkbuild
 
-$(lib_so): $(obj) Makefile.android
+$(lib_so): $(obj) Makefile.android $(libs)
        $(CC) -o $@ -shared -Wl,-soname,$(lib_so) $(obj) $(LDFLAGS)
 
 -include $(dep)