Change build-related files to use Windows SDK 6.1 instead of Windows SDK 6.0.
SDK upgrade is necessary to support dynamic/webfont because SDK 6.0 does not have t2embapi.h and t2embed.lib. SDK 6.1 is compatible with WIn XP and VS 2005 or later. FYI: http://codereview.chromium.org/14084/show is the CL for adding web/dynamic font support. Review URL: http://codereview.chromium.org/14908 git-svn-id: http://src.chromium.org/svn/trunk/src/build@7500 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
9362db329e
Коммит
00e286ec4e
|
@ -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'),
|
||||
|
|
|
@ -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 = [
|
||||
|
|
|
@ -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"
|
||||
|
|
Загрузка…
Ссылка в новой задаче