From 2f3f53ed6173b30caedf1ae9e41dfcab91b90985 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Wed, 29 Jun 2016 17:31:40 +0000 Subject: [PATCH] android build folders (nw) Signed-off-by: Jeffrey Clark --- scripts/toolchain.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 979b22f63b1..d19971d7544 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -772,9 +772,15 @@ function toolchain(_buildDir, _subDir) configuration { "openbsd", "x64", "Debug" } targetdir (_buildDir .. "openbsd" .. "/bin/x64/Debug") + configuration { "android-*", "Release" } + targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Release") + objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"] .. "/Release") + + configuration { "android-*", "Debug" } + targetdir (_buildDir .. "android/bin/" .. _OPTIONS["PLATFORM"] .. "/Debug") + objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"] .. "/Debug") + configuration { "android-*" } - targetdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/bin") - objdir (_buildDir .. "android-" .. _OPTIONS["PLATFORM"] .. "/obj") includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include",