diff options
| author | ruki <[email protected]> | 2022-02-10 20:04:29 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-10 20:04:29 +0800 |
| commit | e93ce24968986daca4186ec7eb96a4a4076043c4 (patch) | |
| tree | 559bcd4b249c417e3099db179d8ab8517ee20eb5 /xmake/plugins | |
| parent | 516025ffbb52b7a81d144026db20f3f0d281b65f (diff) | |
| parent | f2734c060bf981b9349b5bd63dab0f9fb7b6b1df (diff) | |
Merge pull request #2051 from SirLynix/improve_vstudio
Fix runenvs with vs and vsxmake projects
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/project/vstudio/impl/vs201x.lua | 4 | ||||
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua index 2595b19e0..ee0316071 100644 --- a/xmake/plugins/project/vstudio/impl/vs201x.lua +++ b/xmake/plugins/project/vstudio/impl/vs201x.lua @@ -314,9 +314,9 @@ function _make_targetinfo(mode, arch, target, vcxprojdir) end for k, v in pairs(addrunenvs) do if k:upper() == "PATH" then - runenvs[k] = _make_dirs(v, vcxprojdir) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" + runenvs[k] = _make_dirs(v, vcxprojdir) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" else - runenvs[k] = path.joinenv(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" + runenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" end end for k, v in pairs(setrunenvs) do diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index 83a8b6132..2b0264021 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -201,9 +201,9 @@ function _make_targetinfo(mode, arch, target) end for k, v in pairs(addrunenvs) do if k:upper() == "PATH" then - runenvs[k] = _make_dirs(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" + runenvs[k] = _make_dirs(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .. "'))" else - runenvs[k] = path.joinenv(v) .. "$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" + runenvs[k] = path.joinenv(v) .. ";$([System.Environment]::GetEnvironmentVariable('" .. k .."'))" end end for k, v in pairs(setrunenvs) do |