Merge pull request #824 from Blizzard/fix-default-toolset

Set default toolsets for vs2005 and vs2008.
premake · Aug 9, 2017 · a0cbd33 · a0cbd33
2 parents cb1cbe5 + 31353fb
commit a0cbd33
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/modules/vstudio/tests/vc200x/test_excluded_configs.lua b/modules/vstudio/tests/vc200x/test_excluded_configs.lua
@@ -52,6 +52,7 @@
 		test.capture [[
 <Tool
 	Name="VCLinkerTool"
+	AdditionalOptions="/NOLOGO"
 	OutputFile="$(OutDir)\MyProject.exe"
 		]]
 	end
@@ -68,7 +69,7 @@
 		test.capture [[
 <Tool
 	Name="VCLinkerTool"
-	LinkLibraryDependencies="false"
+	AdditionalOptions="/NOLOGO"
 	AdditionalDependencies="bin\Ares\Debug\MyProject2.lib"
 		]]
 	end
diff --git a/modules/vstudio/vs2005.lua b/modules/vstudio/vs2005.lua
@@ -82,6 +82,7 @@
 		-- Visual Studio always uses Windows path and naming conventions
 
 		targetos = "windows",
+		toolset  = "msc-v80",
 
 		-- The capabilities of this action
 

diff --git a/modules/vstudio/vs2008.lua b/modules/vstudio/vs2008.lua
@@ -24,6 +24,7 @@
 		-- Visual Studio always uses Windows path and naming conventions
 
 		targetos = "windows",
+		toolset  = "msc-v90",
 
 		-- The capabilities of this action
 

diff --git a/modules/vstudio/vs200x_vcproj.lua b/modules/vstudio/vs200x_vcproj.lua
@@ -803,7 +803,7 @@
 				links[i] = path.translate(link)
 			end
 		else
-			links = toolset.getlinks(cfg, not ex)
+			links = path.translate(toolset.getlinks(cfg, not ex))
 		end
 
 		if #links > 0 then