Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updating xcode configs. (#248)

Browse Source 
- Matching all xcode actions.
- Setting targetdir for the `Native` platform.
This commit is contained in:
Johan Sköld
2020-07-11 20:40:02 -07:00
committed by GitHub
parent 8d96af9873
commit 7ea784fa27
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/toolchain.lua
View File

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