diff options
Diffstat (limited to 'build')
| -rw-r--r-- | build/SConscript.main | 6 | ||||
| -rw-r--r-- | build/internal/essential.scons | 6 | ||||
| -rw-r--r-- | build/internal/essential.vsprops | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 1b70f11..5e4be8a 100644 --- a/build/SConscript.main +++ b/build/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_vista_6_0/files' +platform_sdk_path = '$CHROME_SRC_DIR/third_party/platformsdk_win2008_6_1/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.0') + msvs_drive + ':\\Program Files\\Microsoft SDKs\\Windows\\v6.1') windows_env.Replace( CSCRIPT = 'c:\\Windows\\System32\\cscript', - PLATFORMSDK_VISTA = platform_sdk_path, + PLATFORMSDK_6_1 = platform_sdk_path, VISUAL_STUDIO = visual_studio_path, CYGWIN_DIR = windows_env.Dir('$CHROME_SRC_DIR/third_party/cygwin'), diff --git a/build/internal/essential.scons b/build/internal/essential.scons index 547f73a..389ae35 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -46,8 +46,7 @@ if env.Bit('windows'): ('_HAS_TR1', 0), ], CPPPATH = [ - '$PLATFORMSDK_VISTA/Include', - '$PLATFORMSDK_VISTA/VC/INCLUDE', + '$PLATFORMSDK_6_1/Include', '$VISUAL_STUDIO/VC/atlmfc/include', ], CCFLAGS = [ @@ -76,8 +75,7 @@ if env.Bit('windows'): '/wd4819', ], LIBPATH = [ - '$PLATFORMSDK_VISTA/Lib', - '$PLATFORMSDK_VISTA/VC/LIB', + '$PLATFORMSDK_6_1/Lib', '$VISUAL_STUDIO/VC/atlmfc/lib', ], LIBS = [ diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops index 0537f85..2fcc472 100644 --- a/build/internal/essential.vsprops +++ b/build/internal/essential.vsprops @@ -56,7 +56,7 @@ /> <UserMacro Name="SDK" - Value="$(SolutionDir)..\third_party\platformsdk_vista_6_0\files" + Value="$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files" /> <UserMacro Name="SDKIncludes" |