diff --git a/xmake/plugins/project/vstudio/vs.lua b/xmake/plugins/project/vstudio/vs.lua index e108ef22f27..1284828c61f 100644 --- a/xmake/plugins/project/vstudio/vs.lua +++ b/xmake/plugins/project/vstudio/vs.lua @@ -22,6 +22,7 @@ import("impl.vs200x") import("impl.vs201x") import("impl.vsinfo") +import("core.project.config") -- make factory function make(version) @@ -34,7 +35,7 @@ function make(version) -- get vs version info local info = vsinfo(version) - if vsver < 2010 then + if version < 2010 then return function(outputdir) vs200x.make(outputdir, info) end diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index b012ffff027..906148fa2f6 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -242,7 +242,7 @@ function main(outputdir, vsinfo) vsinfo.projectdir = project.directory() vsinfo.sln_projectfile = path.relative(project.file(), vsinfo.solution_dir) local projectfile = path.filename(project.file()) - vsinfo.slnfile = project.name() or path.filename(project.directory()) + vsinfo.slnfile = path.filename(project.directory()) -- write only if not default if projectfile ~= "xmake.lua" then vsinfo.projectfile = projectfile diff --git a/xmake/plugins/project/vsxmake/vsxmake.lua b/xmake/plugins/project/vsxmake/vsxmake.lua index 785569aefb9..2526b00cb93 100644 --- a/xmake/plugins/project/vsxmake/vsxmake.lua +++ b/xmake/plugins/project/vsxmake/vsxmake.lua @@ -23,6 +23,7 @@ import("core.base.hashset") import("vstudio.impl.vsinfo", { rootdir = path.directory(os.scriptdir()) }) import("render") import("getinfo") +import("core.project.config") local template_root = path.join(os.scriptdir(), "vsproj", "templates") local template_sln = path.join(template_root, "sln", "vsxmake.sln")