diff options
| author | Steven Knight <knight@baldmt.com> | 2003-08-02 04:21:04 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-08-02 04:21:04 (GMT) |
| commit | 7500d447bdc3bd94db8ffbc8b90298fd9479e8c3 (patch) | |
| tree | 8fd61414ac1632db5a257cdff4f7e896432476d3 /src/engine/SCons/Tool/msvc.py | |
| parent | c60c5895032874ffdc0767648e5c7ff7fda94968 (diff) | |
| download | SCons-7500d447bdc3bd94db8ffbc8b90298fd9479e8c3.zip SCons-7500d447bdc3bd94db8ffbc8b90298fd9479e8c3.tar.gz SCons-7500d447bdc3bd94db8ffbc8b90298fd9479e8c3.tar.bz2 | |
Add support for a platform-independent CPPDEFINES variable.
Diffstat (limited to 'src/engine/SCons/Tool/msvc.py')
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index fc86ee1..3d6f3ab 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -374,7 +374,7 @@ def generate(env): env['CCPDBFLAGS'] = '${(PDB and "/Zi /Fd%s"%File(PDB)) or ""}' env['CCPCHFLAGS'] = '${(PCH and "/Yu%s /Fp%s"%(PCHSTOP or "",File(PCH))) or ""}' - env['CCCOMFLAGS'] = '$CPPFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS' + env['CCCOMFLAGS'] = '$CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo$TARGET $CCPCHFLAGS $CCPDBFLAGS' env['CC'] = 'cl' env['CCFLAGS'] = '/nologo' env['CCCOM'] = '$CC $CCFLAGS $CCCOMFLAGS' @@ -387,6 +387,8 @@ def generate(env): env['SHCXX'] = '$CXX' env['SHCXXFLAGS'] = '$CXXFLAGS' env['SHCXXCOM'] = '$SHCXX $SHCXXFLAGS $CCCOMFLAGS' + env['CPPDEFPREFIX'] = '/D' + env['CPPDEFSUFFIX'] = '' env['INCPREFIX'] = '/I' env['INCSUFFIX'] = '' env['OBJEMITTER'] = object_emitter @@ -394,7 +396,7 @@ def generate(env): env['RC'] = 'rc' env['RCFLAGS'] = '' - env['RCCOM'] = '$RC $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES' + env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES' CScan = env.get_scanner('.c') if CScan: CScan.add_skey('.rc') @@ -419,7 +421,7 @@ def generate(env): env['CFILESUFFIX'] = '.c' env['CXXFILESUFFIX'] = '.cc' - env['PCHCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPINCFLAGS /c $SOURCES /Fo${TARGETS[1]} /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS' + env['PCHCOM'] = '$CXX $CXXFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c $SOURCES /Fo${TARGETS[1]} /Yc$PCHSTOP /Fp${TARGETS[0]} $CCPDBFLAGS' env['BUILDERS']['PCH'] = pch_builder def exists(env): |