diff options
author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 21:01:41 +0000 |
---|---|---|
committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-12 21:01:41 +0000 |
commit | 52e935d04c59135739c3a68fb6e19d313dc6d5ad (patch) | |
tree | 95f7ab178b045bef4456cbf92c6aa7e476becd99 /skia/SConscript | |
parent | 30fab79877b4bb067944b74d98346ac9bb6bfc7e (diff) | |
download | chromium_src-52e935d04c59135739c3a68fb6e19d313dc6d5ad.zip chromium_src-52e935d04c59135739c3a68fb6e19d313dc6d5ad.tar.gz chromium_src-52e935d04c59135739c3a68fb6e19d313dc6d5ad.tar.bz2 |
New drop of Skia. This is up to CL 121320.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/SConscript')
-rw-r--r-- | skia/SConscript | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/skia/SConscript b/skia/SConscript index eb1f265..ae26b3e 100644 --- a/skia/SConscript +++ b/skia/SConscript @@ -49,10 +49,12 @@ input_files = [ 'corecg/SkDebug.cpp', 'corecg/SkDebug_stdio.cpp', 'corecg/SkFloat.cpp', + 'corecg/SkFloatBits.cpp', 'corecg/SkInterpolator.cpp', 'corecg/SkMath.cpp', 'corecg/SkMatrix.cpp', 'corecg/SkMemory_stdlib.cpp', + 'corecg/SkPageFlipper.cpp', 'corecg/SkPoint.cpp', 'corecg/SkRect.cpp', 'corecg/SkRegion.cpp', @@ -86,6 +88,8 @@ input_files = [ 'images/SkImageDecoder.cpp', 'images/SkImageRef.cpp', 'images/SkStream.cpp', + 'picture/SkPathHeap.cpp', + 'picture/SkPicture.cpp', 'picture/SkPictureFlat.cpp', 'picture/SkPicturePlayback.cpp', 'picture/SkPictureRecord.cpp', @@ -131,7 +135,6 @@ input_files = [ 'sgl/SkPath.cpp', 'sgl/SkPathEffect.cpp', 'sgl/SkPathMeasure.cpp', - 'sgl/SkPicture.cpp', 'sgl/SkPixelRef.cpp', 'sgl/SkProcSpriteBlitter.cpp', 'sgl/SkPtrRecorder.cpp', @@ -172,6 +175,8 @@ if env['PLATFORM'] == 'posix': input_files.append('ports/SkFontHost_fontconfig.cpp') input_files.append('images/SkMMapStream.cpp') + env.Append(CCFLAGS = ['-Wno-unused-function']) + if env['PLATFORM'] in ('darwin', 'posix'): input_files.append('ports/SkThread_pthread.cpp') |