diff options
| author | Steven Knight <knight@baldmt.com> | 2004-07-08 04:01:21 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-07-08 04:01:21 (GMT) |
| commit | b7323556133cd1b757f11411adb53342dcbb1f28 (patch) | |
| tree | 5d95f43b72f85f96674b3a47668d186f95ab9988 /src/engine/SCons/Tool/msvc.py | |
| parent | 325ecc35c1eaa8e9bdb8b1c0c9d3679840fbc325 (diff) | |
| download | SCons-b7323556133cd1b757f11411adb53342dcbb1f28.zip SCons-b7323556133cd1b757f11411adb53342dcbb1f28.tar.gz SCons-b7323556133cd1b757f11411adb53342dcbb1f28.tar.bz2 | |
Two more win32 fixes: don't have SConfTests.py look for sin(), since it's available in the default library when using Visual Studio; add the new object scanner as the source_scanner for the RES Builder.
Diffstat (limited to 'src/engine/SCons/Tool/msvc.py')
| -rw-r--r-- | src/engine/SCons/Tool/msvc.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/msvc.py b/src/engine/SCons/Tool/msvc.py index 3280eb5..a32c503 100644 --- a/src/engine/SCons/Tool/msvc.py +++ b/src/engine/SCons/Tool/msvc.py @@ -398,7 +398,9 @@ def shared_object_emitter(target, source, env): SCons.Defaults.SharedObjectEmitter) pch_builder = SCons.Builder.Builder(action='$PCHCOM', suffix='.pch', emitter=pch_emitter) -res_builder = SCons.Builder.Builder(action='$RCCOM', suffix='.res') +res_builder = SCons.Builder.Builder(action='$RCCOM', suffix='.res', + source_scanner=SCons.Defaults.ObjSourceScan) +SCons.Defaults.ObjSourceScan.add_scanner('.rc', SCons.Defaults.CScan) def generate(env): """Add Builders and construction variables for MSVC++ to an Environment.""" @@ -438,7 +440,6 @@ def generate(env): env['RC'] = 'rc' env['RCFLAGS'] = SCons.Util.CLVar('') env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS $RCFLAGS /fo$TARGET $SOURCES' - SCons.Defaults.ObjSourceScan.add_scanner('.rc', SCons.Defaults.CScan) env['BUILDERS']['RES'] = res_builder try: |