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

Change case of vc2010.link() to match new extension convention

Browse Source
This commit is contained in:
Jason Perkins 2012-12-06 14:03:17 -05:00
parent 4ead57c055
commit b5cc1b96a2
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@
_p(1,'<ItemDefinitionGroup %s>', vc2010.condition(cfg))
vc2010.clCompile(cfg)
vc2010.resourceCompile(cfg)
vc2010.link(cfg)
vc2010.Link(cfg)
vc2010.buildEvents(cfg)
_p(1,'</ItemDefinitionGroup>')
end
@ -330,7 +330,7 @@
-- Write out the linker tool block.
--
function vc2010.link(cfg)
function vc2010.Link(cfg)
local explicit = vstudio.needsExplicitLink(cfg)
_p(2,'<Link>')
@ -346,13 +346,13 @@
end
if cfg.kind ~= premake.STATICLIB then
vc2010.link_dynamic(cfg, explicit)
vc2010.LinkDynamic(cfg, explicit)
end
_p(2,'</Link>')
if cfg.kind == premake.STATICLIB then
vc2010.link_static(cfg)
vc2010.LinkStatic(cfg)
end
-- Left to its own devices, VS will happily link against a project dependency
@ -365,7 +365,7 @@
end
end
function vc2010.link_dynamic(cfg, explicit)
function vc2010.LinkDynamic(cfg, explicit)
vc2010.additionalDependencies(cfg, explicit)
vc2010.additionalLibraryDirectories(cfg)
@ -380,7 +380,7 @@
vc2010.additionalLinkOptions(cfg)
end
function vc2010.link_static(cfg)
function vc2010.LinkStatic(cfg)
_p(2,'<Lib>')
vc2010.additionalLinkOptions(cfg)
_p(2,'</Lib>')

2
tests/actions/vstudio/vc2010/test_excluded_configs.lua
View File

@ -37,7 +37,7 @@
local function prepare(platform)
local cfg = premake5.project.getconfig(prj, "Debug", platform)
vc2010.link(cfg)
vc2010.Link(cfg)
end

2
tests/actions/vstudio/vc2010/test_link.lua
View File

@ -24,7 +24,7 @@
local function prepare(platform)
cfg = project.getconfig(prj, "Debug", platform)
vc2010.link(cfg)
vc2010.Link(cfg)
end