Add nano-X include files for android build
authorDaniel G <giri@nwrk.biz>
Thu, 31 Jan 2019 03:15:29 +0000 (04:15 +0100)
committerDaniel G <giri@nwrk.biz>
Thu, 31 Jan 2019 03:15:29 +0000 (04:15 +0100)
_template/src/Makefile

index 2a2442b..f3787b9 100644 (file)
@@ -113,6 +113,7 @@ WINDRES_ANDROID =
 INC_ANDROID=$(INC) -I$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include
 INC_ANDROID+=-I$(ANDROID_NDK_ROOT)/sources/android/support/include
 INC_ANDROID+=-I$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++abi/libcxxabi/include
+INC_ANDROID+=-I$(WORKDIR)/../include/nanox
 LIBDIR_ANDROID = -L$(WORKDIR)/../lib/android_$(ANDROID_ARCH)
 LIBDIR_ANDROID += -L$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/$(ANDROID_ARCH_VER)
 CFLAGS_ANDROID  = $(CFLAGS) --sysroot=$(ANDROID_NDK_ROOT)/platforms/$(ANDROID_PLATORM)/arch-$(ANDROID_ARCH) -D_ANDROID
@@ -446,6 +447,9 @@ out_apk:
        cd $(GENDIR_ANDROID) && $(AAPT) add $(GENDIR_ANDROID)/$(PROJNAME).apk.unaligned classes.dex
        cd $(ANDROID_SRC) && $(AAPT) add -v $(GENDIR_ANDROID)/$(PROJNAME).apk.unaligned lib/$(ANDROID_ARCH_VER)/lib$(PROJNAME).so
        cd $(ANDROID_SRC) && $(AAPT) add -v $(GENDIR_ANDROID)/$(PROJNAME).apk.unaligned lib/$(ANDROID_ARCH_VER)/liballegro.so
+       cd $(ANDROID_SRC) && $(AAPT) add -v $(GENDIR_ANDROID)/$(PROJNAME).apk.unaligned assets/fonts/rgb.txt
+       cd $(ANDROID_SRC) && $(AAPT) add -v $(GENDIR_ANDROID)/$(PROJNAME).apk.unaligned assets/fonts/fonts.dir
+       cd $(ANDROID_SRC) && $(AAPT) add -v $(GENDIR_ANDROID)/$(PROJNAME).apk.unaligned assets/fonts/fonts.alias
 
 clean_android_apk:
        rm -rf $(OUT_ANDROID)