diff options
| author | Steven Knight <knight@baldmt.com> | 2001-11-24 23:15:01 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2001-11-24 23:15:01 (GMT) |
| commit | 378373defaf150feb90cd54d13626516c6dbe1b4 (patch) | |
| tree | fc9783004f1cae3c3558846d6f9a1c589e104a3e /src/engine/SCons/Defaults.py | |
| parent | 139a0052dc0bff059dc9b8cf1739396304e7c129 (diff) | |
| download | SCons-378373defaf150feb90cd54d13626516c6dbe1b4.zip SCons-378373defaf150feb90cd54d13626516c6dbe1b4.tar.gz SCons-378373defaf150feb90cd54d13626516c6dbe1b4.tar.bz2 | |
More NT portability fixes.
Diffstat (limited to 'src/engine/SCons/Defaults.py')
| -rw-r--r-- | src/engine/SCons/Defaults.py | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py index 0bc82eb..be750e4 100644 --- a/src/engine/SCons/Defaults.py +++ b/src/engine/SCons/Defaults.py @@ -102,6 +102,10 @@ if os.name == 'posix': elif os.name == 'nt': + MVSdir = r'C:\Program Files\Microsoft Visual Studio' + MVSVCdir = r'%s\VC98' % MVSdir + MVSCommondir = r'%s\Common' % MVSdir + ConstructionEnvironment = { 'CC' : 'cl', 'CCFLAGS' : '/nologo', @@ -111,10 +115,10 @@ elif os.name == 'nt': 'CXXCOM' : '$CXX $CXXFLAGS $_INCFLAGS /c $SOURCES /Fo$TARGET', 'LINK' : 'link', 'LINKFLAGS' : '', - 'LINKCOM' : '$LINK $LINKFLAGS /out:$TARGET $_LIBDIRFLAGS $_LIBFLAGS $SOURCES', + 'LINKCOM' : '$LINK $LINKFLAGS /OUT:$TARGET $_LIBDIRFLAGS $_LIBFLAGS $SOURCES', 'AR' : 'lib', 'ARFLAGS' : '/nologo', - 'ARCOM' : '$AR $ARFLAGS /out:$TARGET $SOURCES', + 'ARCOM' : '$AR $ARFLAGS /OUT:$TARGET $SOURCES', 'BUILDERS' : [Object, Program, Library], 'SCANNERS' : [CScan], 'OBJPREFIX' : '', @@ -123,14 +127,21 @@ elif os.name == 'nt': 'PROGSUFFIX' : '.exe', 'LIBPREFIX' : '', 'LIBSUFFIX' : '.lib', - 'LIBDIRPREFIX' : '/L', + 'LIBDIRPREFIX' : '/LIBPATH', 'LIBDIRSUFFIX' : '', 'LIBLINKPREFIX' : '', 'LIBLINKSUFFIX' : '$LIBSUFFIX', 'INCPREFIX' : '/I', 'INCSUFFIX' : '', 'ENV' : { - 'PATH' : r'C:\Python20;C:\WINNT\system32;C:\WINNT;C:\Program Files\Microsoft Visual Studio\VC98\Bin\;', + 'INCLUDE' : r'%s\atl\include;%s\mfc\include;%s\include' + % (MVSVCdir, MVSVCdir, MVSVCdir), + 'LIB' : r'%s\mvc\lib;%s\lib' + % (MVSVCdir, MVSVCdir), + 'MSDEVDIR' : r'%s\MSDev98' % MVSCommondir, + 'PATH' : r'C:\Python20;C:\WINNT\system32;C:\WINNT;%s\Tools\WinNT;%s\MSDev98\Bin;%s\Tools;%s\Bin;' + % (MVSCommondir, MVSCommondir, + MVSCommondir, MVSVCdir), 'PATHEXT' : '.COM;.EXE;.BAT;.CMD', }, } |