Revert sdk 6.1 upgrade changes.

TBR=nsylvain

Review URL: http://codereview.chromium.org/17021

git-svn-id: http://src.chromium.org/svn/trunk/src/build@7501 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

SConscript.main

@@ -269,16 +269,16 @@ else:
 visual_studio_path = msvs_drive + ':/Program Files/Microsoft Visual Studio 8'
 
 # If side-by-side platform sdk is not available try local copy.
-platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_win2008_6_1/files'
+platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_vista_6_0/files'
 if (root_env['PLATFORM'] in ['win32', 'cygwin'] and
     not os.path.exists(windows_env.subst(platform_sdk_path))):
   platform_sdk_path = (
-      msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.1')
+      msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.0')
 
 windows_env.Replace(
     CSCRIPT = 'c:\\Windows\\System32\\cscript',
 
-    PLATFORMSDK_6_1 = platform_sdk_path,
+    PLATFORMSDK_VISTA = platform_sdk_path,
     VISUAL_STUDIO = visual_studio_path,
 
     CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'),

internal/essential.scons

@@ -46,7 +46,8 @@ if env.Bit('windows'):
           ('_HAS_TR1', 0),
       ],
       CPPPATH = [
-          '$PLATFORMSDK_6_1/Include',
+          '$PLATFORMSDK_VISTA/Include',
+          '$PLATFORMSDK_VISTA/VC/INCLUDE',
           '$VISUAL_STUDIO/VC/atlmfc/include',
       ],
       CCFLAGS = [
@@ -75,7 +76,8 @@ if env.Bit('windows'):
           '/wd4819',
       ],
       LIBPATH = [
-          '$PLATFORMSDK_6_1/Lib',
+          '$PLATFORMSDK_VISTA/Lib',
+          '$PLATFORMSDK_VISTA/VC/LIB',
           '$VISUAL_STUDIO/VC/atlmfc/lib',
       ],
       LIBS = [

internal/essential.vsprops

@@ -56,7 +56,7 @@
 	/>
 	<UserMacro
 		Name="SDK"
-		Value="$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files"
+		Value="$(SolutionDir)..\third_party\platformsdk_vista_6_0\files"
 	/>
 	<UserMacro
 		Name="SDKIncludes"