projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Add user clip planes support to gen6.
[mesa.git]
/
scons
/
mslib_sa.py
diff --git
a/scons/mslib_sa.py
b/scons/mslib_sa.py
index c5ebdec273f233b5655c5530702402e60d12726d..bdc0dd9251170f318cdeed27aa76b7b8e52f1506 100644
(file)
--- a/
scons/mslib_sa.py
+++ b/
scons/mslib_sa.py
@@
-7,7
+7,7
@@
Based on SCons.Tool.mslib, without the MSVC detection.
"""
#
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
, 2009
The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@
-118,12
+118,10
@@
def generate(env):
if env.Detect('lib'):
env['AR'] = 'lib'
if env.Detect('lib'):
env['AR'] = 'lib'
- el
if env.Detect('link')
:
+ el
se
:
# Recent WINDDK versions do not ship with lib.
env['AR'] = 'link /lib'
env['TEMPFILE'] = TempFileMunge
# Recent WINDDK versions do not ship with lib.
env['AR'] = 'link /lib'
env['TEMPFILE'] = TempFileMunge
- else:
- raise SCons.Errors.InternalError, "lib and link not found"
env['ARFLAGS'] = SCons.Util.CLVar('/nologo')
env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
env['LIBPREFIX'] = ''
env['ARFLAGS'] = SCons.Util.CLVar('/nologo')
env['ARCOM'] = "${TEMPFILE('$AR $ARFLAGS /OUT:$TARGET $SOURCES')}"
env['LIBPREFIX'] = ''
@@
-132,4
+130,8
@@
def generate(env):
def exists(env):
return env.Detect('lib') or env.Detect('link')
def exists(env):
return env.Detect('lib') or env.Detect('link')
-# vim:set ts=4 sw=4 et:
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4: