|
|
@@ -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 {
|