added cgmath, libanim, and libpsys

[andemo] / Makefile.android

diff --git a/Makefile.android b/Makefile.android
index f76adc4..336d7c9 100644 (file)
--- a/Makefile.android
+++ b/Makefile.android
@@ -1,7 +1,6 @@
 SDK ?= /usr/lib/android-sdk
 NDK ?= /usr/lib/android-ndk
 CCSYSROOT = --sysroot=$(NDK)/sysroot
-ISYS = --isystem=$(CCSYSROOT)/usr/include/aarch64-linux-android
 LDSYSROOT = --sysroot=$(NDK)/platforms/android-23/arch-arm64
 PLATFORM_JAR = $(SDK)/platforms/android-23/android.jar
 TCPATH = $(NDK)/toolchains/llvm/prebuilt/linux-$(shell uname -m)/bin
@@ -20,12 +19,13 @@ act = android.app.NativeActivity
 warn = -pedantic -Wall
 dbg = -g
 opt = -O3 -ffast-math -fno-strict-aliasing
-incdir = -Isrc -Ilibs/imago/src
+def = -DGLDEF
+incdir = -Isrc -Ilibs -Ilibs/imago/src
 libdir = -Llibs/android
 
 CC = $(TC)clang
 CFLAGS = $(CCSYSROOT) $(ISYS) $(warn) $(dbg) $(opt) $(def) $(incdir) -fPIC -fcommon -MMD
-LDFLAGS = $(LDSYSROOT) $(libdir) -landroid -llog -lEGL -lGLESv2 -limago
+LDFLAGS = $(LDSYSROOT) $(libdir) -lm -landroid -llog -lEGL -lGLESv2 -limago -lpsys -lanim
 
 $(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 $@ $<
@@ -42,10 +42,10 @@ $(name).unsigned.apk: $(lib_so) AndroidManifest.xml
        mkdir -p apkbuild/assets
        cp -r data apkbuild/assets
        cp -r sdr apkbuild/assets
-       aapt package -f -v -F $@ -I $(PLATFORM_JAR) -M AndroidManifest.xml apkbuild
+       aapt package -f -F $@ -I $(PLATFORM_JAR) -M AndroidManifest.xml apkbuild
 
 $(lib_so): $(obj) Makefile.android
-       $(CC) -o $@ -shared $(obj) $(LDFLAGS)
+       $(CC) -o $@ -shared -Wl,-soname,$(lib_so) $(obj) $(LDFLAGS)
 
 -include $(dep)
 
@@ -84,3 +84,7 @@ run:
 .PHONY: stop
 stop:
        adb shell am force-stop $(pkg)
+
+.PHONY: logcat
+logcat:
+       adb logcat $(name):V AndroidRuntime:V DEBUG:V '*:S'