diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 19:14:31 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-30 19:14:31 +0000 |
| commit | 2ae5547f328619cf90c2cefd4603e5db62469fe7 (patch) | |
| tree | 83dc46cf5afdccc0b2aa1643ced08f3b3e4ca3b1 /build | |
| parent | 4ca4e4d93de615dd2ce5a4c5f442bd7760b0951c (diff) | |
| download | chromium_src-2ae5547f328619cf90c2cefd4603e5db62469fe7.zip chromium_src-2ae5547f328619cf90c2cefd4603e5db62469fe7.tar.gz chromium_src-2ae5547f328619cf90c2cefd4603e5db62469fe7.tar.bz2 | |
Revert sdk 6.1 upgrade changes.
TBR=nsylvain
Review URL: http://codereview.chromium.org/17021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7501 0039d316-1c4b-4281-b951-d872f2087c98
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, 8 insertions, 6 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 5e4be8a..1b70f11 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_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'), diff --git a/build/internal/essential.scons b/build/internal/essential.scons index 389ae35..547f73a 100644 --- a/build/internal/essential.scons +++ b/build/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 = [ diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops index 2fcc472..0537f85 100644 --- a/build/internal/essential.vsprops +++ b/build/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" |