Merge Xcode module integration

This commit is contained in:
Jason Perkins 2015-03-10 17:49:43 -04:00
commit f0215968ba
5 changed files with 14 additions and 2 deletions

View File

@ -1 +1 @@
3935627f6ef6f848afd1ac3b22cc1eaa7b34a582 modules/xcode
44e7630091915c687ded94b1bce64d61573cf833 modules/xcode

View File

@ -15,6 +15,8 @@ Builds and Infrastructure:
Patch contributors:
Manu Evans <https://bitbucket.org/TurkeyMan>
* new APIs for debugging, controlling warnings, undefining symbols
noresources <https://bitbucket.org/noresources>
Mihai Sebea <http://twitter.com/mihai_sebea>
* Xcode exporter fixes and improvements
Renaud Guillard <https://bitbucket.org/noresources>
* add library search paths argument to os.findlib()
* return command exit code from os.outputof()

View File

@ -7,6 +7,7 @@
local function loadScript(fname)
fname = path.getabsolute(fname)
local f = io.open(fname)
local s = assert(f:read("*a"))
f:close()

View File

@ -85,4 +85,8 @@
"actions/clean/_clean.lua",
"_premake_init.lua",
-- Built-in action modules. The action is registered, but the actual
-- implementation is not loaded unless the action is used.
"../modules/xcode/_action.lua",
}

View File

@ -197,6 +197,11 @@
if act then
_OS = act.os or _OS
end
-- Some are implemented in standalone modules
if act and act.module then
require(act.module)
end
end