summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2003-02-26 12:04:40 (GMT)
committerSteven Knight <knight@baldmt.com>2003-02-26 12:04:40 (GMT)
commit8a816e6362b715a238183ae25551dbb6df7cddc3 (patch)
tree7238d5c6f412f429afaa93470fb6e60a308399f7
parent074103edfe5dcbb8d013efc97f10b9d5c855e67e (diff)
downloadSCons-8a816e6362b715a238183ae25551dbb6df7cddc3.zip
SCons-8a816e6362b715a238183ae25551dbb6df7cddc3.tar.gz
SCons-8a816e6362b715a238183ae25551dbb6df7cddc3.tar.bz2
Add SharedObject() support to masm. (Lachlan O'Dea)
-rw-r--r--src/CHANGES.txt4
-rw-r--r--src/engine/SCons/Tool/masm.py2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 97e60b6..a913314 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -37,6 +37,10 @@ RELEASE 0.12 - XXX
- Add support for Tar and Zip files.
+ From Lachlan O'Dea:
+
+ - Add SharedObject() support to the masm tool.
+
RELEASE 0.11 - Tue, 11 Feb 2003 05:24:33 -0600
diff --git a/src/engine/SCons/Tool/masm.py b/src/engine/SCons/Tool/masm.py
index 5419c6d..7aa3485 100644
--- a/src/engine/SCons/Tool/masm.py
+++ b/src/engine/SCons/Tool/masm.py
@@ -51,9 +51,11 @@ def generate(env, platform):
for suffix in ASSuffixes:
static_obj.add_action(suffix, SCons.Defaults.ASAction)
+ shared_obj.add_action(suffix, SCons.Defaults.ASAction)
for suffix in ASPPSuffixes:
static_obj.add_action(suffix, SCons.Defaults.ASPPAction)
+ shared_obj.add_action(suffix, SCons.Defaults.ASPPAction)
env['AS'] = 'ml'
env['ASFLAGS'] = '/nologo'