From 7ea784fa2749de5ccbcd4164ac4889fcdf6edfd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Sk=C3=B6ld?= Date: Sat, 11 Jul 2020 20:40:02 -0700 Subject: [PATCH] Updating xcode configs. (#248) - Matching all xcode actions. - Setting targetdir for the `Native` platform. --- scripts/toolchain.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 086f30a..55bd031 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -463,9 +463,7 @@ function toolchain(_buildDir, _libDir) end - elseif _ACTION == "xcode4" - or _ACTION == "xcode8" - or _ACTION == "xcode9" then + elseif _ACTION and _ACTION:match("^xcode.+$") then local action = premake.action.current() local str_or = function(str, def) return #str > 0 and str or def @@ -1007,7 +1005,11 @@ function toolchain(_buildDir, _libDir) configuration { "osx", "Universal" } targetdir (path.join(_buildDir, "osx_universal/bin")) - objdir (path.join(_buildDir, "osx_universal/bin")) + objdir (path.join(_buildDir, "osx_universal/obj")) + + configuration { "osx", "Native" } + targetdir (path.join(_buildDir, "osx/bin")) + objdir (path.join(_buildDir, "osx/obj")) configuration { "osx" } buildoptions {