diff options
| author | Steven Knight <knight@baldmt.com> | 2002-03-28 07:10:47 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-03-28 07:10:47 (GMT) |
| commit | 3fc94e0dbe47a09928fae20e8f53d8c93499035d (patch) | |
| tree | 5e9f3d3d0eb0eeaf039851ae9abbcc31de48cb99 /src | |
| parent | f52c6264753cf84c3f650da057f628c4fd6901cd (diff) | |
| download | SCons-3fc94e0dbe47a09928fae20e8f53d8c93499035d.zip SCons-3fc94e0dbe47a09928fae20e8f53d8c93499035d.tar.gz SCons-3fc94e0dbe47a09928fae20e8f53d8c93499035d.tar.bz2 | |
Support a CPPFLAGS variable (a la GNU Make).
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Defaults.py | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b3dc356..93bdb9f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -64,6 +64,9 @@ RELEASE 0.06 - - Add support for compiling Fortran programs from a variety of suffixes (a la GNU Make): .f, .F, .for, .FOR, .fpp and .FPP + - Support a CPPFLAGS variable on all default commands that use the + C preprocessor. + From Steve Leblanc: - Add support for the -U option. diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index d14bbc7..711130d 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -243,11 +243,11 @@ def make_win32_env_from_paths(include, lib, path): return { 'CC' : 'cl', 'CCFLAGS' : '/nologo', - 'CCCOM' : '$CC $CCFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET', + 'CCCOM' : '$CC $CCFLAGS $CPPFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET', 'CFILESUFFIX' : '.c', 'CXX' : '$CC', 'CXXFLAGS' : '$CCFLAGS', - 'CXXCOM' : '$CXX $CXXFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET', + 'CXXCOM' : '$CXX $CXXFLAGS $CPPFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET', 'CXXFILESUFFIX' : '.cc', 'F77' : 'g77', 'F77FLAGS' : '', @@ -325,11 +325,11 @@ if os.name == 'posix': ConstructionEnvironment = { 'CC' : 'cc', 'CCFLAGS' : '', - 'CCCOM' : '$CC $CCFLAGS $_INCFLAGS -c -o $TARGET $SOURCES', + 'CCCOM' : '$CC $CCFLAGS $CPPFLAGS $_INCFLAGS -c -o $TARGET $SOURCES', 'CFILESUFFIX' : '.c', 'CXX' : 'c++', 'CXXFLAGS' : '$CCFLAGS', - 'CXXCOM' : '$CXX $CXXFLAGS $_INCFLAGS -c -o $TARGET $SOURCES', + 'CXXCOM' : '$CXX $CXXFLAGS $CPPFLAGS $_INCFLAGS -c -o $TARGET $SOURCES', 'CXXFILESUFFIX' : '.cc', 'F77' : 'g77', 'F77FLAGS' : '', |