diff options
| author | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-31 01:06:00 +0000 |
|---|---|---|
| committer | jungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-31 01:06:00 +0000 |
| commit | 55d14908fea4f62ddd1d15583d6c78476a030dd2 (patch) | |
| tree | 9bb5d753e4460ba51268c4c1451a7ae901a9dcd0 /build | |
| parent | 5efd1f158ccdf184a55ef3ca03c1acbd1eb3a67d (diff) | |
| download | chromium_src-55d14908fea4f62ddd1d15583d6c78476a030dd2.zip chromium_src-55d14908fea4f62ddd1d15583d6c78476a030dd2.tar.gz chromium_src-55d14908fea4f62ddd1d15583d6c78476a030dd2.tar.bz2 | |
Update build files to use PSDK 6.1 (platformsdk_win2008_6_1). This is necessary for
dynamic font support.
This is a re-run of http://codereview.chromium.org/14908/show (except that chrome_dll.deps file which needs to be updated along with the actual code change)
This will be followed by http://codereview.chromium.org/16494 (actual webkit code change) and changes in webkit/build
BUG=1303
Review URL: http://codereview.chromium.org/16496
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7520 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, 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" |