summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLightInk <[email protected]>2016-09-19 12:01:00 +0800
committerLightInk <[email protected]>2016-09-19 12:01:00 +0800
commit18109e5c684cbb917fa590ee0f019a095f703d5a (patch)
treeadd7c32cea333cb321bdaea8680c0c576da655d2
parentb6de2bb9a396b49ac8c4447fe2b584118e90d99b (diff)
fix vs201x ToolsVersion bug
-rwxr-xr-xxmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua2
-rwxr-xr-xxmake/plugins/project/vstudio/vs2010.lua1
-rwxr-xr-xxmake/plugins/project/vstudio/vs2012.lua1
3 files changed, 3 insertions, 1 deletions
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"
}