diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 16:54:06 +0200 | 
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 16:54:06 +0200 | 
| commit | efdf3fdbcd2f7654cb8d1209a8b040914437bacd (patch) | |
| tree | 19f68a3e29675ad73f57f7c639a044290660782f /src/engine/SCons/Tool/MSCommon/vs.py | |
| parent | 697e33ed224b539a42ff68121f7497f5bbf941b2 (diff) | |
New upstream version 3.1.0upstream/3.1.0
Diffstat (limited to 'src/engine/SCons/Tool/MSCommon/vs.py')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/vs.py | 15 | 
1 files changed, 13 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py index 72d4421..731f328 100644 --- a/src/engine/SCons/Tool/MSCommon/vs.py +++ b/src/engine/SCons/Tool/MSCommon/vs.py @@ -21,7 +21,7 @@  # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  # -__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"  __doc__ = """Module to detect Visual Studio and/or Visual C/C++  """ @@ -198,6 +198,17 @@ class VisualStudio(object):  # Tool/MSCommon/vc.py, and the MSVC_VERSION documentation in Tool/msvc.xml.  SupportedVSList = [ +    # Visual Studio 2019 +    VisualStudio('14.2', +                 vc_version='14.2', +                 sdk_version='10.0A', +                 hkeys=[], +                 common_tools_var='VS160COMNTOOLS', +                 executable_path=r'Common7\IDE\devenv.com', +                 batch_file_path=r'VC\Auxiliary\Build\vsvars32.bat', +                 supported_arch=['x86', 'amd64', "arm"], +                 ), +      # Visual Studio 2017      VisualStudio('14.1',                   vc_version='14.1', @@ -520,7 +531,7 @@ def get_default_arch(env):      if not msvs:          arch = 'x86' -    elif not arch in msvs.get_supported_arch(): +    elif arch not in msvs.get_supported_arch():          fmt = "Visual Studio version %s does not support architecture %s"          raise SCons.Errors.UserError(fmt % (env['MSVS_VERSION'], arch))  | 
