From 18109e5c684cbb917fa590ee0f019a095f703d5a Mon Sep 17 00:00:00 2001
From: LightInk <baisaichen@live.com>
Date: Mon, 19 Sep 2016 12:01:00 +0800
Subject: fix vs201x ToolsVersion bug

---
 xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua | 2 +-
 xmake/plugins/project/vstudio/vs2010.lua              | 1 +
 xmake/plugins/project/vstudio/vs2012.lua              | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index dc62aa656..e77d52446 100755
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -118,7 +118,7 @@ function _make_header(vcxprojfile, vsinfo, target)
 
     -- make header
     vcxprojfile:print("<?xml version=\"1.0\" encoding=\"utf-8\"?>")
-    vcxprojfile:enter("<Project DefaultTargets=\"Build\" ToolsVersion=\"%s.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", assert(versions["vs" .. vsinfo.vstudio_version]))
+    vcxprojfile:enter("<Project DefaultTargets=\"Build\" ToolsVersion=\"%s\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", vsinfo.filters_version)
 end
 
 -- make tailer
diff --git a/xmake/plugins/project/vstudio/vs2010.lua b/xmake/plugins/project/vstudio/vs2010.lua
index 63d418a5c..0f40134e0 100755
--- a/xmake/plugins/project/vstudio/vs2010.lua
+++ b/xmake/plugins/project/vstudio/vs2010.lua
@@ -30,6 +30,7 @@ function make(outputdir)
     local vsinfo = 
     {
         vstudio_version     = "2010"
+	,   filters_version     = "4.0"
     ,   solution_version    = "11"
     }
 
diff --git a/xmake/plugins/project/vstudio/vs2012.lua b/xmake/plugins/project/vstudio/vs2012.lua
index b2a552513..00932c407 100755
--- a/xmake/plugins/project/vstudio/vs2012.lua
+++ b/xmake/plugins/project/vstudio/vs2012.lua
@@ -30,6 +30,7 @@ function make(outputdir)
     local vsinfo = 
     {
         vstudio_version     = "2012"
+	,   filters_version     = "4.0"
     ,   solution_version    = "12"
     }
 
-- 
cgit v1.3.1


From 5e4bdd5caafca38b6f32d5eb7a73abbcd1050348 Mon Sep 17 00:00:00 2001
From: LightInk <baisaichen@live.com>
Date: Mon, 19 Sep 2016 13:36:59 +0800
Subject: change vs201x_vcxproj versions

---
 xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index e77d52446..c74cc7c81 100755
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -110,15 +110,15 @@ function _make_header(vcxprojfile, vsinfo, target)
     -- the versions
     local versions = 
     {
-        vs2010 = '10'
-    ,   vs2012 = '11'
+        vs2010 = '4'
+    ,   vs2012 = '4'
     ,   vs2013 = '12'
     ,   vs2015 = '14'
     }
 
     -- make header
     vcxprojfile:print("<?xml version=\"1.0\" encoding=\"utf-8\"?>")
-    vcxprojfile:enter("<Project DefaultTargets=\"Build\" ToolsVersion=\"%s\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", vsinfo.filters_version)
+    vcxprojfile:enter("<Project DefaultTargets=\"Build\" ToolsVersion=\"%s.0\" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\">", assert(versions["vs" .. vsinfo.vstudio_version]))
 end
 
 -- make tailer
-- 
cgit v1.3.1