AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

adding table.filterempty to vstudio.path

Browse Source
This commit is contained in:
Tom van Dijck 2015-06-08 11:48:02 -07:00 committed by Damien Courtois
parent cd80c5a9c5
commit 155dbe48bb
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/actions/vstudio/_vstudio.lua
View File

@ -399,7 +399,13 @@
function vstudio.path(cfg, value)
cfg = cfg.project or cfg
return path.translate(project.getrelative(cfg, value))
local dirs = path.translate(project.getrelative(cfg, value))
if type(dirs) == 'table' then
dirs = table.filterempty(dirs)
end
return dirs
end

15
src/actions/vstudio/vs2010_vcxproj.lua
View File

@ -904,8 +904,7 @@
function m.additionalIncludeDirectories(cfg, includedirs)
if #includedirs > 0 then
local dirs = vstudio.path(cfg.project, includedirs)
dirs = table.filterempty(dirs)
local dirs = vstudio.path(cfg, includedirs)
if #dirs > 0 then
p.x('<AdditionalIncludeDirectories>%s;%%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>', table.concat(dirs, ";"))
end
@ -1142,11 +1141,15 @@
function m.forceIncludes(cfg, condition)
if #cfg.forceincludes > 0 then
local includes = vstudio.path(cfg, cfg.forceincludes)
m.element("ForcedIncludeFiles", condition, table.concat(includes, ';'))
if #includes > 0 then
m.element("ForcedIncludeFiles", condition, table.concat(includes, ';'))
end
end
if #cfg.forceusings > 0 then
local usings = vstudio.path(cfg, cfg.forceusings)
m.element("ForcedUsingFiles", condition, table.concat(usings, ';'))
if #usings > 0 then
m.element("ForcedUsingFiles", condition, table.concat(usings, ';'))
end
end
end
@ -1445,9 +1448,7 @@
function m.executablePath(cfg)
local dirs = project.getrelative(cfg.project, cfg.bindirs)
dirs = table.filterempty(dirs)
local dirs = vstudio.path(cfg, cfg.bindirs)
if #dirs > 0 then
_x(2,'<ExecutablePath>%s;$(ExecutablePath)</ExecutablePath>', path.translate(table.concat(dirs, ";")))
end