From d7bfb00718976b2bcc374ec1e9140800401203cf Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Fri, 1 Jul 2016 23:06:20 -0500 Subject: android objdir (nw) * 2f3f53e got objdir wrong (type folder duplicate) --- scripts/toolchain.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/toolchain.lua') diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index d19971d7544..ff2f10ebbc2 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -774,13 +774,12 @@ function toolchain(_buildDir, _subDir) 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-*" } + objdir (_buildDir .. "android/obj/" .. _OPTIONS["PLATFORM"]) includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", -- cgit v1.2.3-70-g09d2