diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 17:31:13 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-19 17:31:13 +0000 |
| commit | cda3b60500714baf33e3201417942d6d9722d8fa (patch) | |
| tree | 28c102c2f721db0936f9d205fa28b178b951faf3 /base/SConscript | |
| parent | 81140117aa0a736c17e8c1746d433662a3503036 (diff) | |
| download | chromium_src-cda3b60500714baf33e3201417942d6d9722d8fa.zip chromium_src-cda3b60500714baf33e3201417942d6d9722d8fa.tar.gz chromium_src-cda3b60500714baf33e3201417942d6d9722d8fa.tar.bz2 | |
Update SCons base_unittests build to track recent (?) VS build changes:
* Add $GTEST_DIR{,/include} to CPPPATH.
* Fix a typo in $ICU38/_DIRpublic/i18n.
* Add GOOGLE_CHROME_BUILD to CPPDEFINES.
* Remove /Wp64.
TBR: bradnelson
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
| -rw-r--r-- | base/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/SConscript b/base/SConscript index 7b5273a..a937c09 100644 --- a/base/SConscript +++ b/base/SConscript @@ -178,13 +178,15 @@ env.ChromeStaticLibrary('base', input_files) env_tests.Prepend( CPPPATH = [ + '$GTEST_DIR/include', + '$GTEST_DIR', '$SKIA_DIR/include', '$SKIA_DIR/include/corecg', '$SKIA_DIR/platform', '$ZLIB_DIR', '$LIBPNG_DIR', '$ICU38_DIR/public/common', - '$ICU38/_DIRpublic/i18n', + '$ICU38_DIR/public/i18n', '..', ], CPPDEFINES = [ @@ -192,6 +194,7 @@ env_tests.Prepend( 'PNG_USER_CONFIG', 'CHROME_PNG_WRITE_SUPPORT', 'U_STATIC_IMPLEMENTATION', + 'GOOGLE_CHROME_BUILD', ], LIBS = [ 'base', @@ -215,7 +218,6 @@ if env['PLATFORM'] == 'win32': CCFLAGS = [ '/TP', '/WX', - '/Wp64', ], CPPDEFINES = [ '_WIN32_WINNT=0x0600', |