From f767ae7a1e904c6a7410dc4529f921e33939674a Mon Sep 17 00:00:00 2001
From: "rahulk@google.com"
 <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 13 Aug 2008 15:56:35 +0000
Subject: Adding preprocessor definitions to separate Google Chrome from
 Chromium. - I assume we will need to build Debug version also for Google
 Chrome. - Code changes will come soon that will rely on GOOGLE_CHROME_BUILD
 being defined to add Google branding. - Currently I do not want to change the
 default behavior so it is inhreiting chromium_build_google_chrome.vsprops.
 Once buildbot scripts have been configured properly and we know what to do
 for developers machines, we will inherit
 chromium_build$CHROMIUM_BUILD.vsprops

BUG=1296800


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@809 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/debug.vsprops                                 |  2 +-
 build/internal/README.google                        |  3 +++
 build/internal/chromium_build.vsprops               | 11 +++++++++++
 build/internal/chromium_build_google_chrome.vsprops | 11 +++++++++++
 build/release.vsprops                               |  2 +-
 5 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 build/internal/chromium_build.vsprops
 create mode 100644 build/internal/chromium_build_google_chrome.vsprops

diff --git a/build/debug.vsprops b/build/debug.vsprops
index d84e13c..61b2230 100644
--- a/build/debug.vsprops
+++ b/build/debug.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="debug"
-	InheritedPropertySheets=".\internal\essential.vsprops"
+	InheritedPropertySheets=".\internal\essential.vsprops;internal\chromium_build_google_chrome.vsprops"
 	>
 	<Tool
 		Name="VCCLCompilerTool"
diff --git a/build/internal/README.google b/build/internal/README.google
index 4624830..9fadd12 100644
--- a/build/internal/README.google
+++ b/build/internal/README.google
@@ -1,4 +1,7 @@
 Internal property sheets:
+  chromium_build*.vsprops
+    Defines preprocessor definitions to control the various flavors of Chromium (currently Chromium or Google Chrome). The appropriate chromium_build*.vsprops file gets included in debug.vsprops and release.vsprops based on CHROMIUM_BUILD environment variable.
+    
   essential.vsprops
     Contains the common settings used throughout the projects. Is included by either ..\debug.vsprops or ..\release.vsprops, so in general, it is not included directly.
 
diff --git a/build/internal/chromium_build.vsprops b/build/internal/chromium_build.vsprops
new file mode 100644
index 0000000..9fdb4e1
--- /dev/null
+++ b/build/internal/chromium_build.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="chromium_build"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="CHROMIUM_BUILD"
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/internal/chromium_build_google_chrome.vsprops b/build/internal/chromium_build_google_chrome.vsprops
new file mode 100644
index 0000000..aa11b8a
--- /dev/null
+++ b/build/internal/chromium_build_google_chrome.vsprops
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="chromium_build"
+	>
+	<Tool
+		Name="VCCLCompilerTool"
+		PreprocessorDefinitions="GOOGLE_CHROME_BUILD"
+	/>
+</VisualStudioPropertySheet>
diff --git a/build/release.vsprops b/build/release.vsprops
index a36897f..c421b10 100644
--- a/build/release.vsprops
+++ b/build/release.vsprops
@@ -3,6 +3,6 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="release"
-	InheritedPropertySheets="internal\release_impl$(CHROME_BUILD_TYPE).vsprops"
+	InheritedPropertySheets="internal\release_impl$(CHROME_BUILD_TYPE).vsprops;internal\chromium_build_google_chrome.vsprops"
 	>
 </VisualStudioPropertySheet>
-- 
cgit v1.1