From 18109e5c684cbb917fa590ee0f019a095f703d5a Mon Sep 17 00:00:00 2001 From: LightInk Date: Mon, 19 Sep 2016 12:01:00 +0800 Subject: fix vs201x ToolsVersion bug --- xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmake/plugins/project/vstudio/impl') 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("") - vcxprojfile:enter("", assert(versions["vs" .. vsinfo.vstudio_version])) + vcxprojfile:enter("", vsinfo.filters_version) end -- make tailer -- cgit v1.3.1 From 5e4bdd5caafca38b6f32d5eb7a73abbcd1050348 Mon Sep 17 00:00:00 2001 From: LightInk 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(-) (limited to 'xmake/plugins/project/vstudio/impl') 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("") - vcxprojfile:enter("", vsinfo.filters_version) + vcxprojfile:enter("", assert(versions["vs" .. vsinfo.vstudio_version])) end -- make tailer -- cgit v1.3.1