diff options
| author | OpportunityLiu <[email protected]> | 2019-07-19 00:03:57 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-19 11:48:33 +0800 |
| commit | ca45f8941e0b69582021d34061873c8752f76154 (patch) | |
| tree | 89a6bf45c6dc6ef52872b5d99d8b622c43ce9835 | |
| parent | e765aa75b91f847e93893271abe1cf265126da54 (diff) | |
fix config
| -rw-r--r-- | xmake/plugins/project/vstudio/vs.lua | 3 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 2 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/vsxmake.lua | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/xmake/plugins/project/vstudio/vs.lua b/xmake/plugins/project/vstudio/vs.lua index e108ef22f..1284828c6 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 b012ffff0..906148fa2 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 785569aef..2526b00cb 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") |