Skip to content
Snippets Groups Projects
Commit 4ca4e4d9 authored by jungshik@google.com's avatar jungshik@google.com
Browse files

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: svn://svn.chromium.org/chrome/trunk/src@7500 0039d316-1c4b-4281-b951-d872f2087c98
parent 7e3dcd91
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
......@@ -28,4 +28,5 @@ delay_loaded = [
'dwmapi.dll',
'COMDLG32.dll',
'urlmon.dll',
't2embed.dll',
]
......@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\Include;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE;$(VSInstallDir)\VC\atlmfc\include"
AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include"
PreprocessorDefinitions="_WIN32_WINNT=0x0501;WINVER=0x0501;WIN32;_DEBUG"
MinimalRebuild="true"
BasicRuntimeChecks="0"
......@@ -120,7 +120,7 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\Include;$(SolutionDir)..\third_party\platformsdk_vista_6_0\files\VC\INCLUDE;$(VSInstallDir)\VC\atlmfc\include"
AdditionalIncludeDirectories="$(SolutionDir)..;$(SolutionDir)..\third_party\platformsdk_win2008_6_1\files\Include;$(VSInstallDir)\VC\atlmfc\include"
PreprocessorDefinitions="_WIN32_WINNT=0x0501;WINVER=0x0501;WIN32;NDEBUG"
RuntimeLibrary="0"
BufferSecurityCheck="false"
......
......@@ -101,7 +101,7 @@ sub process_raw($) {
if ($filename =~ m/microsoft visual studio 8/) {
next;
}
if ($filename =~ m/platformsdk_vista_6_0/) {
if ($filename =~ m/platformsdk_win2008_6_1/) {
next;
}
if ($location_blame eq "") {
......
......@@ -117,7 +117,7 @@ class Stack:
# if functions match the following, elide them from the stack
pat_func_elide = (re.compile('^std::'), re.compile('^new\('))
# if files match the following, elide them from the stack
pat_file_elide = (re.compile('.*platformsdk_vista.*'),
pat_file_elide = (re.compile('.*platformsdk_win2008.*'),
re.compile('.*.(dll|DLL)$'),
# bug 1069902
re.compile('webkit/pending/wtf/fastmalloc\.h'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment