From 4ca4e4d93de615dd2ce5a4c5f442bd7760b0951c Mon Sep 17 00:00:00 2001
From: "jungshik@google.com"
<jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 30 Dec 2008 18:59:47 +0000
Subject: [PATCH] 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
---
build/SConscript.main | 6 +++---
build/internal/essential.scons | 6 ++----
build/internal/essential.vsprops | 2 +-
chrome/app/chrome.dll.deps | 1 +
sandbox/wow_helper/wow_helper.vcproj | 4 ++--
tools/memory_watcher/scripts/memtrace.pl | 2 +-
tools/purify/purify_message.py | 2 +-
7 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/build/SConscript.main b/build/SConscript.main
index 1b70f11fc03b0..5e4be8abf39cc 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 547f73a30acd0..389ae354ed18c 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 0537f8574dcd1..2fcc4721d5053 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"
diff --git a/chrome/app/chrome.dll.deps b/chrome/app/chrome.dll.deps
index e493f2b9081b4..34a1a7029968d 100644
--- a/chrome/app/chrome.dll.deps
+++ b/chrome/app/chrome.dll.deps
@@ -28,4 +28,5 @@ delay_loaded = [
'dwmapi.dll',
'COMDLG32.dll',
'urlmon.dll',
+ 't2embed.dll',
]
diff --git a/sandbox/wow_helper/wow_helper.vcproj b/sandbox/wow_helper/wow_helper.vcproj
index 7a2d8c66c664c..5482fbddce241 100644
--- a/sandbox/wow_helper/wow_helper.vcproj
+++ b/sandbox/wow_helper/wow_helper.vcproj
@@ -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"
diff --git a/tools/memory_watcher/scripts/memtrace.pl b/tools/memory_watcher/scripts/memtrace.pl
index 64ad966d9686b..3c014d0b6bec8 100644
--- a/tools/memory_watcher/scripts/memtrace.pl
+++ b/tools/memory_watcher/scripts/memtrace.pl
@@ -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 "") {
diff --git a/tools/purify/purify_message.py b/tools/purify/purify_message.py
index be1b58d421345..9ff107f505628 100644
--- a/tools/purify/purify_message.py
+++ b/tools/purify/purify_message.py
@@ -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'),
--
GitLab