From 56c2cd7ae2a4324bc191a680c2429add1a5a1644 Mon Sep 17 00:00:00 2001 From: José Fonseca Date: Thu, 16 Apr 2009 21:41:01 +0100 Subject: scons: Cleanup. --- scons/winsdk.py | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'scons/winsdk.py') diff --git a/scons/winsdk.py b/scons/winsdk.py index 255f9c5a65..7e874a507b 100644 --- a/scons/winsdk.py +++ b/scons/winsdk.py @@ -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'): -- cgit v1.2.3