diff options
| author | Steven Knight <knight@baldmt.com> | 2002-07-14 17:57:51 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2002-07-14 17:57:51 (GMT) |
| commit | 4a6f158a8f3589b43fcda1c5ca50b743661a87f2 (patch) | |
| tree | d4f9aaf64bc29cf5c8cc2d9bc8f72716996b4fd7 /src | |
| parent | 721c0b5439329cce1a68d44c0e58204a83d9d354 (diff) | |
| download | SCons-4a6f158a8f3589b43fcda1c5ca50b743661a87f2.zip SCons-4a6f158a8f3589b43fcda1c5ca50b743661a87f2.tar.gz SCons-4a6f158a8f3589b43fcda1c5ca50b743661a87f2.tar.bz2 | |
Still more Win32 portability.
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Platform/win32.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Util.py | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/engine/SCons/Platform/win32.py b/src/engine/SCons/Platform/win32.py index 121fed6..9640439 100644 --- a/src/engine/SCons/Platform/win32.py +++ b/src/engine/SCons/Platform/win32.py @@ -58,5 +58,5 @@ def generate(env): env['LIBSUFFIX'] = '.lib' env['SHLIBPREFIX'] = '' env['SHLIBSUFFIX'] = '.dll' - env['LIBPREFIXES'] = '$LIBPREFIX' - env['LIBSUFFIXES'] = '$LIBSUFFIX' + env['LIBPREFIXES'] = [ '$LIBPREFIX', '$SHLIBPREFIX' ] + env['LIBSUFFIXES'] = [ '$LIBSUFFIX', '$SHLIBSUFFIX' ] diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index eda8c40..89871a3 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -47,10 +47,15 @@ except ImportError: class UserString: pass +_altsep = os.altsep +if _altsep is None and sys.platform == 'win32': + # My ActivePython 2.0.1 doesn't set os.altsep! What gives? + _altsep = '/' + def splitext(path): "Same as os.path.splitext() but faster." - if os.altsep: - sep = max(string.rfind(path, os.sep), string.rfind(path, os.altsep)) + if _altsep: + sep = max(string.rfind(path, os.sep), string.rfind(path, _altsep)) else: sep = string.rfind(path, os.sep) dot = string.rfind(path, '.') |