summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <cuavas@users.noreply.github.com>2016-07-02 14:21:32 +1000
committer GitHub <noreply@github.com>2016-07-02 14:21:32 +1000
commit448d04e9b938414f9b538697d2842090924f9008 (patch)
tree819c37b3f98ef2989b83bb7d4b4c3ec79431c537
parent4142ecd7944d0098f986320f95c47a87aa76fe8e (diff)
parentd7bfb00718976b2bcc374ec1e9140800401203cf (diff)
Merge pull request #1027 from h0tw1r3/master
android objdir (nw)
-rw-r--r--scripts/toolchain.lua3
1 files changed, 1 insertions, 2 deletions
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",