diff --git a/src/actions/vstudio/vs2010_vcxproxj.lua b/src/actions/vstudio/vs2010_vcxproxj.lua
index cd1eb28e..ad31ce14 100644
--- a/src/actions/vstudio/vs2010_vcxproxj.lua
+++ b/src/actions/vstudio/vs2010_vcxproxj.lua
@@ -174,9 +174,11 @@ local vs10_helpers = premake.vstudio.vs10_helpers
end
local function incremental_link(cfg,cfginfo)
- _p(2,'%s'
+ if cfg.kind ~= "StaticLib" then
+ _p(2,'%s'
,premake.esc(cfginfo.name)
,tostring(premake.config.should_link_incrementally(cfg)))
+ end
end
diff --git a/tests/actions/vstudio/test_vs2010_project_kinds.lua b/tests/actions/vstudio/test_vs2010_project_kinds.lua
index 5cf95b36..e2bc1a67 100644
--- a/tests/actions/vstudio/test_vs2010_project_kinds.lua
+++ b/tests/actions/vstudio/test_vs2010_project_kinds.lua
@@ -21,14 +21,7 @@
buffer = io.endcapture()
return buffer
end
- --incorrect assumption
- --[[
- function vs10_project_kinds.staticLib_doesNotContainLinkSection()
- kind "StaticLib"
- local buffer = get_buffer()
- test.string_does_not_contain(buffer,'.*')
- end
- --]]
+
function vs10_project_kinds.staticLib_containsLibSection()
kind "StaticLib"
@@ -40,13 +33,7 @@
local buffer = get_buffer()
test.string_contains(buffer,'.*.*MyProject.lib.*.*')
end
- --[[
- function vs10_project_kinds.sharedLib_fail_asIDoNotKnowWhatItShouldLookLike_printsTheBufferSoICanCompare()
- kind "SharedLib"
- local buffer = get_buffer()
- test.string_contains(buffer,'youWillNotFindThis')
- end
- --]]
+
--[[
check OutDir in debug it is showing "."
@@ -124,15 +111,11 @@ shared lib missing ??? in link section when noIn
test.string_contains(buffer,'.*.*')
end
- --behaviour changed so that is is set one way or the other
- --[[
function vs10_project_kinds.staticLib_doesNotContainLinkIncremental()
kind "StaticLib"
- flags {"Symbols"}
local buffer = get_buffer()
test.string_does_not_contain(buffer,'')
end
- --]]
function vs10_project_kinds.sharedLib_withoutOptimisation_linkIncrementalValueIsTrue()
kind "SharedLib"