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

diff --git a/Makefile.android b/Makefile.android
index 0d3fa8b..336d7c9 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -1,8 +1,7 @@
 SDK ?= /usr/lib/android-sdk
 NDK ?= /usr/lib/android-ndk
-CCSYSROOT = $(NDK)/sysroot
-ISYS = $(CCSYSROOT)/usr/include/aarch64-linux-android
-LDSYSROOT = $(NDK)/platforms/android-23/arch-arm64
+CCSYSROOT = --sysroot=$(NDK)/sysroot
+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
 TC = $(TCPATH)/aarch64-linux-android23-
@@ -20,11 +19,13 @@ act = android.app.NativeActivity
 warn = -pedantic -Wall
 dbg = -g
 opt = -O3 -ffast-math -fno-strict-aliasing
-incdir = -Isrc
+def = -DGLDEF
+incdir = -Isrc -Ilibs -Ilibs/imago/src
+libdir = -Llibs/android
 
 CC = $(TC)clang
-CFLAGS = --sysroot=$(CCSYSROOT) -isystem=$(ISYS) $(warn) $(dbg) $(opt) $(def) $(incdir) -fPIC -fcommon -MMD
-LDFLAGS = --sysroot=$(LDSYSROOT) -lEGL -lGLESv2
+CFLAGS = $(CCSYSROOT) $(ISYS) $(warn) $(dbg) $(opt) $(def) $(incdir) -fPIC -fcommon -MMD
+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 $@ $<
@@ -38,10 +39,13 @@ $(name).aligned.apk: $(name).unsigned.apk
 $(name).unsigned.apk: $(lib_so) AndroidManifest.xml
 	mkdir -p apkbuild/lib/arm64-v8a
 	cp $(lib_so) apkbuild/lib/arm64-v8a
-	aapt package -f -v -F $@ -I $(PLATFORM_JAR) -M AndroidManifest.xml apkbuild
+	mkdir -p apkbuild/assets
+	cp -r data apkbuild/assets
+	cp -r sdr apkbuild/assets
+	aapt package -f -F $@ -I $(PLATFORM_JAR) -M AndroidManifest.xml apkbuild
 
-$(lib_so): $(obj)
-	$(CC) -o $@ -shared $(obj) $(LDFLAGS)
+$(lib_so): $(obj) Makefile.android
+	$(CC) -o $@ -shared -Wl,-soname,$(lib_so) $(obj) $(LDFLAGS)
 
 -include $(dep)
 
@@ -56,6 +60,15 @@ clean:
 cleandep:
 	rm -f $(dep)
 
+.PHONY: libs
+libs:
+	$(MAKE) CC=$(CC) sys=android-arm64 -C libs
+
+.PHONY: clean-libs
+clean-libs:
+	$(MAKE) sys=android-arm64 -C libs clean
+
+
 .PHONY: install
 install: $(name).apk
 	adb install -r $(name).apk
@@ -71,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'