diff options
| author | Richard Viney <richard.viney@gmail.com> | 2015-09-18 07:06:39 (GMT) |
|---|---|---|
| committer | Richard Viney <richard.viney@gmail.com> | 2015-09-18 07:06:39 (GMT) |
| commit | f65ea0c5b50572926e11e03c91ebd45b760d073e (patch) | |
| tree | 3dd66dd87faa480d0276072378cfb21f662ca97b /src | |
| parent | a6a65ee80272d61fa2e09e33eeedfa0e08aed333 (diff) | |
| download | SCons-f65ea0c5b50572926e11e03c91ebd45b760d073e.zip SCons-f65ea0c5b50572926e11e03c91ebd45b760d073e.tar.gz SCons-f65ea0c5b50572926e11e03c91ebd45b760d073e.tar.bz2 | |
Fix PCHPDBFLAGS causing a deprecation warning on MSVC v8 and later when using PCHs and PDBs together
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/__init__.py | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/__init__.py b/src/engine/SCons/Tool/MSCommon/__init__.py index fe4a7c6..c87bf71 100644 --- a/src/engine/SCons/Tool/MSCommon/__init__.py +++ b/src/engine/SCons/Tool/MSCommon/__init__.py @@ -41,7 +41,8 @@ from SCons.Tool.MSCommon.sdk import mssdk_exists, \ from SCons.Tool.MSCommon.vc import msvc_exists, \ msvc_setup_env, \ - msvc_setup_env_once + msvc_setup_env_once, \ + msvc_version_to_maj_min from SCons.Tool.MSCommon.vs import get_default_version, \ get_vs_by_version, \ diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index 878ec6e..e6a9428 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -47,7 +47,7 @@ import SCons.Util import SCons.Warnings import SCons.Scanner.RC -from MSCommon import msvc_exists, msvc_setup_env_once +from MSCommon import msvc_exists, msvc_setup_env_once, msvc_version_to_maj_min CSuffixes = ['.c', '.C'] CXXSuffixes = ['.cc', '.cpp', '.cxx', '.c++', '.C++'] @@ -259,7 +259,12 @@ def generate(env): env['CFILESUFFIX'] = '.c' env['CXXFILESUFFIX'] = '.cc' - env['PCHPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Yd") or ""}']) + maj, min = msvc_version_to_maj_min(env['MSVC_VERSION']) + if maj < 8: + env['PCHPDBFLAGS'] = SCons.Util.CLVar(['${(PDB and "/Yd") or ""}']) + else: + env['PCHPDBFLAGS'] = '' + env['PCHCOM'] = '$CXX /Fo${TARGETS[1]} $CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS $PCHPDBFLAGS' env['BUILDERS']['PCH'] = pch_builder |