From b5cc1b96a2cd316c229c25726bed74120b1e6f78 Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Thu, 6 Dec 2012 14:03:17 -0500 Subject: [PATCH] Change case of vc2010.link() to match new extension convention --- src/actions/vstudio/vs2010_vcxproj.lua | 12 ++++++------ .../actions/vstudio/vc2010/test_excluded_configs.lua | 2 +- tests/actions/vstudio/vc2010/test_link.lua | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua index 6c2dfd49..fc1ad082 100644 --- a/src/actions/vstudio/vs2010_vcxproj.lua +++ b/src/actions/vstudio/vs2010_vcxproj.lua @@ -48,7 +48,7 @@ _p(1,'', vc2010.condition(cfg)) vc2010.clCompile(cfg) vc2010.resourceCompile(cfg) - vc2010.link(cfg) + vc2010.Link(cfg) vc2010.buildEvents(cfg) _p(1,'') 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,'') @@ -346,13 +346,13 @@ end if cfg.kind ~= premake.STATICLIB then - vc2010.link_dynamic(cfg, explicit) + vc2010.LinkDynamic(cfg, explicit) end _p(2,'') 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,'') vc2010.additionalLinkOptions(cfg) _p(2,'') diff --git a/tests/actions/vstudio/vc2010/test_excluded_configs.lua b/tests/actions/vstudio/vc2010/test_excluded_configs.lua index ad0b3840..08bee4d2 100644 --- a/tests/actions/vstudio/vc2010/test_excluded_configs.lua +++ b/tests/actions/vstudio/vc2010/test_excluded_configs.lua @@ -37,7 +37,7 @@ local function prepare(platform) local cfg = premake5.project.getconfig(prj, "Debug", platform) - vc2010.link(cfg) + vc2010.Link(cfg) end diff --git a/tests/actions/vstudio/vc2010/test_link.lua b/tests/actions/vstudio/vc2010/test_link.lua index c1509f07..18feb042 100644 --- a/tests/actions/vstudio/vc2010/test_link.lua +++ b/tests/actions/vstudio/vc2010/test_link.lua @@ -24,7 +24,7 @@ local function prepare(platform) cfg = project.getconfig(prj, "Debug", platform) - vc2010.link(cfg) + vc2010.Link(cfg) end