summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author夕伽 <[email protected]>2018-09-04 08:36:31 +0800
committer夕伽 <[email protected]>2018-09-04 08:36:31 +0800
commitb5b1c689f508068ffbde704194b08569151e383a (patch)
tree4b28fbb69701e3ba938cb7c0944f4e1e3ecfe18d
parent9ee12112e49db451a49a66d77dd2990d9f6ddab9 (diff)
Fix bug for VS2003 can't be found
(xmake config --vs=2003)
-rw-r--r--xmake/modules/detect/sdks/find_vstudio.lua5
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