Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(299)

Side by Side Diff: skia/SConscript

Issue 14113: Remove few more errors in mac scons build. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/SConscript.main ('k') | webkit/SConscript » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.Prepend( 9 env.Prepend(
10 CPPPATH = [ 10 CPPPATH = [
(...skipping 19 matching lines...) Expand all
30 30
31 '/wd4244', 31 '/wd4244',
32 '/wd4267', 32 '/wd4267',
33 '/wd4345', 33 '/wd4345',
34 '/wd4390', 34 '/wd4390',
35 '/wd4554', 35 '/wd4554',
36 '/wd4800', 36 '/wd4800',
37 ], 37 ],
38 ) 38 )
39 elif env['PLATFORM'] in ('posix', 'darwin'): 39 elif env['PLATFORM'] in ('posix', 'darwin'):
40 # Because images/SkStream.cpp has len asserts. 40 env.Append(CCFLAGS = ['-Wno-unused'])
41 env.Append(CCFLAGS = ['-Wno-unused-variable'])
42 41
43 input_files = [ 42 input_files = [
44 'animator/SkTime.cpp', 43 'animator/SkTime.cpp',
45 'corecg/Sk64.cpp', 44 'corecg/Sk64.cpp',
46 'corecg/SkBuffer.cpp', 45 'corecg/SkBuffer.cpp',
47 'corecg/SkChunkAlloc.cpp', 46 'corecg/SkChunkAlloc.cpp',
48 'corecg/SkCordic.cpp', 47 'corecg/SkCordic.cpp',
49 'corecg/SkDebug.cpp', 48 'corecg/SkDebug.cpp',
50 'corecg/SkDebug_stdio.cpp', 49 'corecg/SkDebug_stdio.cpp',
51 'corecg/SkFloat.cpp', 50 'corecg/SkFloat.cpp',
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 # in the skia directory. 204 # in the skia directory.
206 # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created. 205 # TODO(bradnelson): This step creates a skia.pch.ib_tag file to be created.
207 # It's a 0-length file so likely harmless. Is this a side effect of having 206 # It's a 0-length file so likely harmless. Is this a side effect of having
208 # IncrediBuild installed on the build machine? 207 # IncrediBuild installed on the build machine?
209 pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc') 208 pch, obj = env_p.PCH(['skia.pch', 'precompiled.obj'], 'precompiled.cc')
210 env_p['PCH'] = pch 209 env_p['PCH'] = pch
211 input_files += [obj] 210 input_files += [obj]
212 211
213 env.ChromeStaticLibrary('skia', input_files) 212 env.ChromeStaticLibrary('skia', input_files)
214 213
OLDNEW
« no previous file with comments | « build/SConscript.main ('k') | webkit/SConscript » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698