From 41e044ae012c6b33ea6c9c88860be787b4b5d09e Mon Sep 17 00:00:00 2001 From: Miso Kim Date: Wed, 23 Aug 2017 12:09:38 +0900 Subject: Modification for Android build (NDK r14b, build-tools 21.1.2 and gradle 2.2.1) (#2585) --- scripts/toolchain.lua | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'scripts/toolchain.lua') diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 46a1b4b22ce..7a8a5c43a19 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -836,6 +836,7 @@ function toolchain(_buildDir, _subDir) includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/include", "$(ANDROID_NDK_ROOT)/sources/android/support/include", "$(ANDROID_NDK_ROOT)/sources/android/native_app_glue", } @@ -852,6 +853,9 @@ function toolchain(_buildDir, _subDir) "android", "log", "c++_static", + "c++abi", + "android_support", + "stdc++", "gcc", } buildoptions { @@ -879,6 +883,7 @@ function toolchain(_buildDir, _subDir) configuration { "android-arm" } libdirs { "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a", + "$(ANDROID_NDK_ARM)/lib/gcc/arm-linux-androideabi/4.9.x/armv7-a", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib", } includedirs { @@ -892,6 +897,9 @@ function toolchain(_buildDir, _subDir) "-mfpu=vfpv3-d16", "-mthumb", } + links { + "unwind", + } linkoptions { "-gcc-toolchain $(ANDROID_NDK_ARM)", "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm", -- cgit v1.2.3-70-g09d2