diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 11:04:56 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 11:04:56 -0600 |
commit | 19d063952c4706d4344f207775aa5dfdff8802fd (patch) | |
tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/tools | |
parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) |
Merge master 6.4.6 into DRTVWR-510
Includes the conversion to VS2017 build tools.
Diffstat (limited to 'indra/tools')
-rwxr-xr-x | indra/tools/vstool/VSTool.exe | bin | 24576 -> 24576 bytes | |||
-rwxr-xr-x | indra/tools/vstool/main.cs | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe Binary files differindex 854290b90a..751540413a 100755 --- a/indra/tools/vstool/VSTool.exe +++ b/indra/tools/vstool/VSTool.exe diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs index ef2e582b90..1d6b2f14d1 100755 --- a/indra/tools/vstool/main.cs +++ b/indra/tools/vstool/main.cs @@ -556,7 +556,7 @@ namespace VSTool break;
case "12.00":
- version = "VC120";
+ version = "VC150";
break;
default:
@@ -603,6 +603,10 @@ namespace VSTool progid = "VisualStudio.DTE.12.0";
break;
+ case "VC150":
+ progid = "VisualStudio.DTE.15.0";
+ break;
+
default:
throw new ApplicationException("Can't handle VS version: " + version);
}
|