fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-06 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

scons: Cleanup.

Browse source
This commit is contained in:
José Fonseca 2009-04-16 21:41:01 +01:00
parent 189db329ca
commit 56c2cd7ae2
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scons/mslib_sa.py
View file

@ -118,12 +118,10 @@ def generate(env):
if env.Detect('lib'):
env['AR'] = 'lib'
elif env.Detect('link'):
else:
# 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'] = ''

22
scons/winsdk.py
View file

@ -77,13 +77,9 @@ def get_vc_paths(env):
raise SCons.Errors.InternalError, "Unsupported target machine"
include_dir = 'include'
exe_path = os.path.join(vc_root, bin_dir)
include_path = os.path.join(vc_root, include_dir)
lib_path = os.path.join(vc_root, lib_dir)
env.PrependENVPath('INCLUDE', include_path)
env.PrependENVPath('LIB', lib_path)
env.PrependENVPath('PATH', exe_path)
env.PrependENVPath('PATH', os.path.join(vc_root, bin_dir))
env.PrependENVPath('INCLUDE', os.path.join(vc_root, include_dir))
env.PrependENVPath('LIB', os.path.join(vc_root, lib_dir))
def get_sdk_root(env):
if SCons.Util.can_read_reg:
@ -108,18 +104,14 @@ def get_sdk_paths(env):
if target_cpu in ('generic', 'x86'):
lib_dir = 'Lib'
elif target_cpu == 'x86_64':
lib_dir = 'Lib/x64'
lib_dir = r'Lib\x64'
else:
raise SCons.Errors.InternalError, "Unsupported target machine"
include_dir = 'Include'
exe_path = os.path.join(sdk_root, bin_dir)
include_path = os.path.join(sdk_root, include_dir)
lib_path = os.path.join(sdk_root, lib_dir)
env.PrependENVPath('INCLUDE', include_path)
env.PrependENVPath('LIB', lib_path)
env.PrependENVPath('PATH', exe_path)
env.PrependENVPath('PATH', os.path.join(sdk_root, bin_dir))
env.PrependENVPath('INCLUDE', os.path.join(sdk_root, include_dir))
env.PrependENVPath('LIB', os.path.join(sdk_root, lib_dir))
def generate(env):
if not env.has_key('ENV'):