diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-18 23:26:29 +0000 |
| commit | b96fc5dc177d311db220dc4039e74a9c0d871558 (patch) | |
| tree | 9bbc6ea3af7c0da75d4b6025d4b475dd62eec0b2 /skia | |
| parent | db8635032b1f83436a072be14e425076a7bd8164 (diff) | |
| download | chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.zip chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.gz chromium_src-b96fc5dc177d311db220dc4039e74a9c0d871558.tar.bz2 | |
Convert from using env['PLATFORM'] directly to using the more flexible
and better-thought-out Hammer env.Bits() idioms:
* env['PLATFORM'] == 'win32' => env.Bit('windows')
* env['PLATFORM'] == 'posix' => env.Bit('linux')
* env['PLATFORM'] == 'darwin' => env.Bit('mac')
New idioms:
* env.Bit('posix') => really does mean "any POSIX platform"
* env.AnyBits('mac', 'linux') => specifically mac or linux, excluding
other POSIX platforms
Where we were using compound conditionals (e.g., "env['PLATFORM'] in
('posix', 'darwin')") I tried to take my best shot at translating
the intent (i.e., "env.Bits('posix')" for something POSIX, "not
env.Bits('mac')" for something not yet ported to Mac, etc.)
Review URL: http://codereview.chromium.org/15051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7270 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/SConscript | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/skia/SConscript b/skia/SConscript index 22a3e3d..b09299d 100644 --- a/skia/SConscript +++ b/skia/SConscript @@ -23,7 +23,7 @@ env.Append( ], ) -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): env.Append( CCFLAGS = [ '/TP', @@ -36,7 +36,7 @@ if env['PLATFORM'] == 'win32': '/wd4800', ], ) -elif env['PLATFORM'] in ('posix', 'darwin'): +elif env.Bit('posix'): env.Append(CCFLAGS = ['-Wno-unused']) input_files = [ @@ -159,7 +159,7 @@ input_files = [ 'sgl/SkXfermode.cpp', ] -if env['PLATFORM'] == 'posix': +if env.Bit('linux'): input_files.append('ext/bitmap_platform_device_linux.cc') input_files.append('ext/platform_canvas_linux.cc') input_files.append('ext/platform_device_linux.cc') @@ -176,15 +176,15 @@ if env['PLATFORM'] == 'posix': env.Append(CCFLAGS = ['-Wno-unused-function']) -if env['PLATFORM'] in ('darwin', 'posix'): +if env.Bit('posix'): input_files.append('ports/SkThread_pthread.cpp') -if env['PLATFORM'] == 'darwin': +if env.Bit('mac'): input_files.append('ext/bitmap_platform_device_mac.cc') input_files.append('ext/platform_canvas_mac.cc') input_files.append('ext/platform_device_mac.cc') -if env['PLATFORM'] == 'win32': +if env.Bit('windows'): input_files.append('ext/bitmap_platform_device_win.cc') input_files.append('ext/platform_canvas_win.cc') input_files.append('ext/platform_device_win.cc') |