diff options
| author | SirLynix <[email protected]> | 2023-07-23 08:21:57 +0200 |
|---|---|---|
| committer | SirLynix <[email protected]> | 2023-07-23 08:21:57 +0200 |
| commit | 78817e3a666c1cfd37d3e9f01c7a6caad65e182f (patch) | |
| tree | bdb587ecc269dc3217921086cb12694b1eaf6b18 /xmake/plugins/project/vstudio/impl/vs201x.lua | |
| parent | 9a8133afa8597442a7e93d2b10c8715309f09d93 (diff) | |
Fix vs project generation
Diffstat (limited to 'xmake/plugins/project/vstudio/impl/vs201x.lua')
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 0bb65c994..39cfcc65c 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -323,7 +323,7 @@ function _make_targetinfo(mode, arch, target, vcxprojdir) targetinfo.rundir = target:rundir() -- save runenvs - local runenvs = {} + local targetrunenvs = {} local addrunenvs, setrunenvs = runenvs.make(target) for k, v in table.orderpairs(target:pkgenvs()) do addrunenvs = addrunenvs or {} @@ -337,25 +337,25 @@ function _make_targetinfo(mode, arch, target, vcxprojdir) end for k, v in table.orderpairs(addrunenvs) do if k:upper() == "PATH" then - runenvs[k] = _translate_path(v, vcxprojdir) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" + targetrunenvs[k] = _translate_path(v, vcxprojdir) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" else - runenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" + targetrunenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" end end for k, v in table.orderpairs(setrunenvs) do if #v == 1 then v = v[1] if path.is_absolute(v) and v:startswith(project.directory()) then - runenvs[k] = _translate_path(v, vcxprojdir) + targetrunenvs[k] = _translate_path(v, vcxprojdir) else - runenvs[k] = v[1] + targetrunenvs[k] = v[1] end else - runenvs[k] = path.joinenv(v) + targetrunenvs[k] = path.joinenv(v) end end local runenvstr = {} - for k, v in table.orderpairs(runenvs) do + for k, v in table.orderpairs(targetrunenvs) do table.insert(runenvstr, k .. "=" .. v) end targetinfo.runenvs = table.concat(runenvstr, "\n") |
