X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=Makefile.android;h=5ef4a0d043180814913e1f04cdb334adbea98ff2;hb=ab58ef7af3d960fd1360002a370ec76ce96ab768;hp=0d3fa8b407369e6cc67b42cfe2861d072531a0b6;hpb=891f9a388617aa91728e4ff764e33e528ae37c5d;p=andemo diff --git a/Makefile.android b/Makefile.android index 0d3fa8b..5ef4a0d 100644 --- a/Makefile.android +++ b/Makefile.android @@ -1,8 +1,8 @@ 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 +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 TC = $(TCPATH)/aarch64-linux-android23- @@ -23,8 +23,8 @@ opt = -O3 -ffast-math -fno-strict-aliasing incdir = -Isrc 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) -landroid -llog -lEGL -lGLESv2 $(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 $@ $<