Fixed config.getlinks(), can now find sibling projects properly

This commit is contained in:
Jason Perkins 2012-03-01 19:25:34 -05:00
parent 36978f5063
commit b64395526d
3 changed files with 8 additions and 5 deletions

View File

@ -424,7 +424,7 @@
end
if #cfg.links > 0 then
_x(4,'AdditionalDependencies="%s"', table.concat(toolset.getlinks(cfg), " "))
_x(4,'AdditionalDependencies="%s"', table.concat(toolset.getlinks(cfg, true), " "))
end
_x(4,'OutputFile="$(OutDir)\\%s"', config.gettargetinfo(cfg).name)

View File

@ -626,7 +626,8 @@
--
function premake.project.iscproject(prj)
return prj.language == "C"
local language = prj.language or prj.solution.language
return language == "C"
end
@ -635,7 +636,8 @@
--
function premake.iscppproject(prj)
return (prj.language == "C" or prj.language == "C++")
local language = prj.language or prj.solution.language
return language == "C" or language == "C++"
end
@ -645,5 +647,6 @@
--
function premake.isdotnetproject(prj)
return (prj.language == "C#")
local language = prj.language or prj.solution.language
return language == "C#"
end

View File

@ -139,7 +139,7 @@
local result = {}
local links
if not systemLibsOnly then
if not systemonly then
links = config.getlinks(cfg, "siblings", "object")
for _, link in ipairs(links) do
if link.kind == premake.STATICLIB then