X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile.android;h=336d7c97f3dcc06bcf0797d5e42213cda683131a;hb=fca3f24e31b3bbbe81ce0ef00da901480a2a92cc;hp=cf883454b37c84c9b9331d878faca2b17f801e5a;hpb=c7560762d55919077d830368a05da0ce223bc96a;p=andemo

diff --git a/Makefile.android b/Makefile.android
index cf88345..336d7c9 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -20,12 +20,12 @@ warn = -pedantic -Wall
 dbg = -g
 opt = -O3 -ffast-math -fno-strict-aliasing
 def = -DGLDEF
-incdir = -Isrc -Ilibs/imago/src
+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'