diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 02:15:23 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 02:15:23 +0000 |
| commit | 329554ffb0aee15099fb09b40be4868633d9ca37 (patch) | |
| tree | 6c9107756add071cc625f6d2040a3c8dcd0e2283 /build | |
| parent | 588315176c74c5fef7daba743108727a9ebfc084 (diff) | |
| download | chromium_src-329554ffb0aee15099fb09b40be4868633d9ca37.zip chromium_src-329554ffb0aee15099fb09b40be4868633d9ca37.tar.gz chromium_src-329554ffb0aee15099fb09b40be4868633d9ca37.tar.bz2 | |
It was brought to my attention that defining _HAS_TR1=0 helps with Visual Studio 2008 compilation and causes no adverse effect on Visual Studio 2005.
Thanks to Daniel A. White for the tip.
Review URL: http://codereview.chromium.org/12607
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/internal/essential.scons | 1 | ||||
| -rw-r--r-- | build/internal/essential.vsprops | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build/internal/essential.scons b/build/internal/essential.scons index 1b5ddf3..e2ffc53 100644 --- a/build/internal/essential.scons +++ b/build/internal/essential.scons @@ -36,6 +36,7 @@ if env['PLATFORM'] == 'win32': 'CERT_CHAIN_PARA_HAS_EXTRA_FIELDS', 'WIN32_LEAN_AND_MEAN', '_SECURE_ATL', + ('_HAS_TR1', 0), ], CPPPATH = [ '$PLATFORMSDK_VISTA/files/Include', diff --git a/build/internal/essential.vsprops b/build/internal/essential.vsprops index 21460a9..0537f85 100644 --- a/build/internal/essential.vsprops +++ b/build/internal/essential.vsprops @@ -10,7 +10,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="$(SolutionDir)..;$(SDKIncludes)" - PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL" + PreprocessorDefinitions="_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;_HAS_TR1=0" MinimalRebuild="false" ExceptionHandling="0" BufferSecurityCheck="true" |