diff options
| author | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
|---|---|---|
| committer | bradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-18 00:30:22 +0000 |
| commit | 012adff3836f208288c09323c0de2f93117c13c9 (patch) | |
| tree | d1af9d7e64632c7b79a774015cc0377f0801010c /base/gfx/SConscript | |
| parent | 5ab78644f9d8237553aab6c0b6b97463ecd67bda (diff) | |
| download | chromium_src-012adff3836f208288c09323c0de2f93117c13c9.zip chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.gz chromium_src-012adff3836f208288c09323c0de2f93117c13c9.tar.bz2 | |
Rolling back CL 3578, discovered hammer.bat had not been updated yet.
Review URL: http://codereview.chromium.org/7507
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3582 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/gfx/SConscript')
| -rw-r--r-- | base/gfx/SConscript | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/base/gfx/SConscript b/base/gfx/SConscript index 57d1b54..c862193 100644 --- a/base/gfx/SConscript +++ b/base/gfx/SConscript @@ -6,12 +6,10 @@ Import('env') env = env.Clone() -# This path causing linux to grab the wrong time.h -env.FilterOut( - CPPPATH = [ - '$MAIN_DIR/..', - ], -) +# Remove an inherited relative path that doesn't make sense anymore. This +# makes sure we don't pull in the wrong version of time.h when building on +# linux. +env['CPPPATH'].remove('..') env.Prepend( CPPPATH = [ @@ -22,6 +20,7 @@ env.Prepend( '$LIBPNG_DIR', '$ICU38_DIR/public/common', '$ICU38_DIR/public/i18n', + '../..', ], CPPDEFINES = [ 'PNG_USER_CONFIG', @@ -63,7 +62,6 @@ if env['PLATFORM'] == 'win32': if env['PLATFORM'] == 'win32': input_files.extend([ - 'gdi_util.cc', 'bitmap_platform_device_win.cc', 'platform_canvas_win.cc', 'platform_device_win.cc', @@ -76,3 +74,4 @@ elif env['PLATFORM'] == 'posix': ]) env.ChromeStaticLibrary('base_gfx', input_files) + |