summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-04-29 08:11:09 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-04-29 08:11:09 +0200
commit64219f27d20c0f6f2dc8c168c8c19ba9420f889d (patch)
tree42283d255ca2b2a4aeb654f5c311cbadac5f64a3
parent5a15555d9e7855c1b451c71fe658f6f437341d28 (diff)
Fix OSX target dir
-rw-r--r--scripts/toolchain.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 7ae62b552ad..86998b83813 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -765,7 +765,7 @@ function toolchain(_buildDir, _subDir)
libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
configuration { "osx*", "x32" }
- objdir (_buildDir .. "osx32_clang" .. "/obj")
+ objdir (_buildDir .. "osx_clang" .. "/obj")
buildoptions {
"-m32",
}
@@ -781,10 +781,10 @@ function toolchain(_buildDir, _subDir)
"-m64",
}
- configuration { "osx*", "x32", "Release" }
+ configuration { "osx*", "x64", "Release" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release")
- configuration { "osx*", "x32", "Debug" }
+ configuration { "osx*", "x64", "Debug" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug")
configuration { "ios-arm" }