commit 56c2cd7ae2a4324bc191a680c2429add1a5a1644
author José Fonseca <jfonseca@vmware.com> Thu Apr 16 21:41:01 2009 +0100
committer José Fonseca <jfonseca@vmware.com> Fri Apr 17 09:49:41 2009 +0100
tree 81ce103a8ed8e2ba23293592608fb53fd3a80c38
parent 189db329caba805f4ae9ab28c675f37565fd4c9c

scons: Cleanup.

scons/winsdk.py

diff --git a/scons/winsdk.py b/scons/winsdk.py
index 255f9c5..7e874a5 100644
--- a/scons/winsdk.py
+++ b/scons/winsdk.py
@@ -77,13 +77,9 @@
         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 @@
     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'):