Removed deprecated functions

src/actions/vstudio/_vstudio.lua

@@ -75,7 +75,7 @@
 --    The solution containing the configuration and platform lists.
 --
 
-	function premake.vstudio_buildconfigs2(sln)
+	function premake.vstudio_buildconfigs(sln)
 		local cfgs = { }
 		
 		local platforms = premake.filterplatforms(sln, premake.vstudio_platforms, "Native")
@@ -120,48 +120,6 @@
 	
 
 
-	function premake.vstudio_buildconfigs(sln, with_pseudo)
-		local cfgs = { }
-		
-		local platforms = premake.filterplatforms(sln, premake.vstudio_platforms, "Native")
-		if with_pseudo then		
-			local hascpp    = premake.hascppproject(sln)
-			local hasdotnet = premake.hasdotnetproject(sln)
-
-			if hasdotnet then
-				table.insert(platforms, 1, "any")
-			end
-			if hasdotnet and hascpp then
-				table.insert(platforms, 2, "mixed")
-			end
-		end
-		
-		for _, buildcfg in ipairs(sln.configurations) do
-			for _, platform in ipairs(platforms) do
-				local entry = { }
-			
-				-- PS3 is funky and needs special handling; its really more of a build
-				-- configuration than a platform from Visual Studio's point of view				
-				if platform ~= "PS3" then
-					entry.buildcfg = buildcfg
-					entry.platform = premake.vstudio_platforms[platform]
-				else
-					entry.buildcfg = platform .. " " .. buildcfg
-					entry.platform = "Win32"
-				end
-				
-				-- create a name the way VS likes it
-				entry.name = entry.buildcfg .. "|" .. entry.platform
-				
-				table.insert(cfgs, entry)
-			end
-		end
-		
-		return cfgs
-	end
-	
-
-
 --
 -- Return a configuration type index.
 -- (this should probably go in vs200x_vcproj.lua)
@@ -179,40 +137,6 @@
 	
 	
 
---
--- Extend the filterplatforms() function to handle the different sets of
--- supported platforms for various Visual Studio versions. See filterplatforms()
--- for more details.
---
-
-	function premake.vstudio_filterplatforms(sln)
-		local supported = iif(_ACTION < "vs2005", {}, premake.vstudio_platforms)
-		return premake.filterplatforms(sln, supported, "x32")
-	end
-
-
-
---
--- Build a Visual Studio configuration ID, which looks like {build config}|{platform}.
---
--- @param buildcfg
---    The build configuration, such as "Debug" or "Release".
--- @param platform
---    The target platform, such as "Native" or "x64".
--- @returns
---    A Visual Studio configuration ID string.
---
-
-	function premake.vstudio_getconfigid(buildcfg, platform)
-		if platform == "PS3" then
-			return platform .. " " .. buildcfg .. "|Win32"
-		else
-			return buildcfg .. "|" .. premake.vstudio_platforms[platform]
-		end
-	end
-	
-
-
 --
 -- Clean Visual Studio files
 --

src/actions/vstudio/vs2005_solution.lua

@@ -9,7 +9,7 @@
 		io.eol = '\r\n'
 
 		-- Precompute Visual Studio configurations
-		sln.vstudio_configs = premake.vstudio_buildconfigs2(sln)
+		sln.vstudio_configs = premake.vstudio_buildconfigs(sln)
 		
 		-- Mark the file as Unicode
 		_p('\239\187\191')

src/actions/vstudio/vs200x_vcproj.lua

@@ -55,7 +55,7 @@
 				"VCAuxiliaryManagedWrapperGeneratorTool"
 			}
 		end
-		if platform == "xbox360" then
+		if platform == "Xbox360" then
 			return {
 				"VCPreBuildEventTool",
 				"VCCustomBuildTool",
@@ -174,7 +174,7 @@
 				end
 				_p('\t\t\t>')
 				
-				for _, block in ipairs(getsections(_ACTION, platform)) do
+				for _, block in ipairs(getsections(_ACTION, cfginfo.src_platform)) do
 				
 					-- Compiler block --
 					if block == "VCCLCompilerTool" or block == "VCCLX360CompilerTool" then

tests/test_vs2005_sln.lua

@@ -27,7 +27,7 @@
 	local function prepare()
 		io.capture()
 		premake.buildconfigs()
-		sln.vstudio_configs = premake.vstudio_buildconfigs2(sln)
+		sln.vstudio_configs = premake.vstudio_buildconfigs(sln)
 	end	
 
 	local function addnetproject()

tests/test_vs200x_vcproj.lua

@@ -31,7 +31,7 @@
 	local function prepare()
 		io.capture()
 		premake.buildconfigs()
-		sln.vstudio_configs = premake.vstudio_buildconfigs2(sln)
+		sln.vstudio_configs = premake.vstudio_buildconfigs(sln)
 
 		local cfg = premake.getconfig(sln.projects[1])
 		cfg.name = prj.name