diff options
| author | Steven Knight <knight@baldmt.com> | 2004-11-21 00:41:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-11-21 00:41:12 (GMT) |
| commit | ffc625f8cf332399ba754bf2ebe9e700e5122eac (patch) | |
| tree | 9c21395a4d49fd3aba7a22fe8e93b041445b00b3 /src/engine/SCons/Tool/masm.py | |
| parent | 376cfbfee0d52e867f2c6b955b6e218d788284ba (diff) | |
| download | SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.zip SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.tar.gz SCons-ffc625f8cf332399ba754bf2ebe9e700e5122eac.tar.bz2 | |
Miscellaneous fixes: portability and version fixes, missing , better CXXCOM tests, ATL include directories, intelc Tool import.
Diffstat (limited to 'src/engine/SCons/Tool/masm.py')
| -rw-r--r-- | src/engine/SCons/Tool/masm.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/engine/SCons/Tool/masm.py b/src/engine/SCons/Tool/masm.py index 6841815..a0c03d9 100644 --- a/src/engine/SCons/Tool/masm.py +++ b/src/engine/SCons/Tool/masm.py @@ -62,8 +62,9 @@ def generate(env): env['AS'] = 'ml' env['ASFLAGS'] = SCons.Util.CLVar('/nologo') + env['ASPPFLAGS'] = '$ASFLAGS' env['ASCOM'] = '$AS $ASFLAGS /c /Fo$TARGET $SOURCES' - env['ASPPCOM'] = '$CC $ASFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c /Fo$TARGET $SOURCES' + env['ASPPCOM'] = '$CC $ASPPFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS /c /Fo$TARGET $SOURCES' env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 def exists(env): |