diff options
| author | Steven Knight <knight@baldmt.com> | 2004-07-30 13:05:28 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-07-30 13:05:28 (GMT) |
| commit | 31af139b8a20b975430974a638e957b61cd4cf23 (patch) | |
| tree | 1d8aa3d3678e309f15c83131a38e570cca175035 /src/engine/SCons/Tool/mslink.py | |
| parent | b2a820a2b535f0eeeb0e3074cbc32355ab54db4f (diff) | |
| download | SCons-31af139b8a20b975430974a638e957b61cd4cf23.zip SCons-31af139b8a20b975430974a638e957b61cd4cf23.tar.gz SCons-31af139b8a20b975430974a638e957b61cd4cf23.tar.bz2 | |
Move LIB{PREFIX,SUFFIX} definitions from the Platform modules to individual Tool modules. (Chris Murray)
Diffstat (limited to 'src/engine/SCons/Tool/mslink.py')
| -rw-r--r-- | src/engine/SCons/Tool/mslink.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index c44e62b..0c7b7dc 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -143,7 +143,7 @@ def generate(env): env['LINK'] = 'link' env['LINKFLAGS'] = SCons.Util.CLVar('/nologo') env['_PDB'] = pdbGenerator - env['LINKCOM'] = '${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $SOURCES")}' + env['LINKCOM'] = '${TEMPFILE("$LINK $LINKFLAGS /OUT:$TARGET.win32 $( $_LIBDIRFLAGS $) $_LIBFLAGS $_PDB $SOURCES.win32")}' env.Append(PROGEMITTER = [prog_emitter]) env['LIBDIRPREFIX']='/LIBPATH:' env['LIBDIRSUFFIX']='' @@ -160,7 +160,7 @@ def generate(env): env['REGSVRACTION'] = regServerCheck env['REGSVR'] = os.path.join(SCons.Platform.win32.get_system_root(),'System32','regsvr32') env['REGSVRFLAGS'] = '/s ' - env['REGSVRCOM'] = '$REGSVR $REGSVRFLAGS $TARGET' + env['REGSVRCOM'] = '$REGSVR $REGSVRFLAGS ${TARGET.win32}' try: version = SCons.Tool.msvs.get_default_visualstudio_version(env) |