summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Jeffrey Clark <h0tw1r3@users.noreply.github.com>2016-07-01 23:06:20 -0500
committer Jeffrey Clark <h0tw1r3@users.noreply.github.com>2016-07-01 23:06:32 -0500
commitd7bfb00718976b2bcc374ec1e9140800401203cf (patch)
tree27d6e1931f74c48177a450a13cd9f0d33f839aee
parent491ecdb025640c9419dad2a2003195c52f74f08f (diff)
android objdir (nw)
* 2f3f53e got objdir wrong (type folder duplicate)
-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",