summaryrefslogtreecommitdiff
path: root/xmake
diff options
context:
space:
mode:
authorruki <[email protected]>2016-09-19 14:56:20 +0800
committerGitHub <[email protected]>2016-09-19 14:56:20 +0800
commit4e929cf70abf4e6ccb0b967925e8f72b48e80e8a (patch)
tree54ba4e1bdc65a1aa5642615831421c8fddc627cf /xmake
parentb6de2bb9a396b49ac8c4447fe2b584118e90d99b (diff)
parent5e4bdd5caafca38b6f32d5eb7a73abbcd1050348 (diff)
Merge pull request #29 from baisai/master
fix vs2010 and vs2012 project
Diffstat (limited to 'xmake')
-rwxr-xr-xxmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua4
-rwxr-xr-xxmake/plugins/project/vstudio/vs2010.lua1
-rwxr-xr-xxmake/plugins/project/vstudio/vs2012.lua1
3 files changed, 4 insertions, 2 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index dc62aa656..c74cc7c81 100755
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -110,8 +110,8 @@ function _make_header(vcxprojfile, vsinfo, target)
-- the versions
local versions =
{
- vs2010 = '10'
- , vs2012 = '11'
+ vs2010 = '4'
+ , vs2012 = '4'
, vs2013 = '12'
, vs2015 = '14'
}
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"
}