diff options
| author | ruki <[email protected]> | 2018-09-04 09:15:48 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-09-04 09:15:48 +0800 |
| commit | 35876060fbf8f1141097b7841c90a5512e85e8a1 (patch) | |
| tree | fe155e5ddd4e752bf397a19e01332fad1af213c9 | |
| parent | da9fbc4a72b996aab4e959fd524c210433aa4add (diff) | |
| parent | b5b1c689f508068ffbde704194b08569151e383a (diff) | |
Merge pull request #214 from xigalto/dev
Fix bug for VS2003 can't be found,xmake config --vs=2003
| -rw-r--r-- | xmake/modules/detect/sdks/find_vstudio.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_vstudio.lua b/xmake/modules/detect/sdks/find_vstudio.lua index 83fa54c59..ae011d9db 100644 --- a/xmake/modules/detect/sdks/find_vstudio.lua +++ b/xmake/modules/detect/sdks/find_vstudio.lua @@ -179,14 +179,15 @@ function main() local pathes = { format("$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;%s)\\VC", version), + format("$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;%s)\\VC7\\bin", version), format("$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VS7;%s)\\VC", version), format("$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\SxS\\VS7;%s)\\VC\\Auxiliary\\Build", version), format("$(reg HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\SxS\\VS7;%s)\\VC\\Auxiliary\\Build", version), format("$(env %s)\\..\\..\\VC", vsenvs[version] or "") } - -- find vcvarsall.bat - local vcvarsall = find_file("vcvarsall.bat", pathes) + -- find vcvarsall.bat, vcvars32.bat for vs7.1 + local vcvarsall = find_file("vcvarsall.bat", pathes) or find_file("vcvars32.bat", pathes) if vcvarsall then -- load vcvarsall |