diff options
| author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 01:06:14 +0000 |
|---|---|---|
| committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 01:06:14 +0000 |
| commit | dc6ed80e71fb605ca03ce3a2a61d93845366f9d9 (patch) | |
| tree | 2a3af1586225efa40595d4a3de72424806f7fe25 | |
| parent | f0bf6056b112fc85acdcc4ca47912c84536efeb2 (diff) | |
| download | chromium_src-dc6ed80e71fb605ca03ce3a2a61d93845366f9d9.zip chromium_src-dc6ed80e71fb605ca03ce3a2a61d93845366f9d9.tar.gz chromium_src-dc6ed80e71fb605ca03ce3a2a61d93845366f9d9.tar.bz2 | |
Make Skia build as a dynamic library by fixing up the imports.
The define in the SCons file / vsprops was unused in the Skia source; I imagine
usage of it was removed in the recent Skia merge.
Review URL: http://codereview.chromium.org/16263
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7471 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | skia/SConscript | 4 | ||||
| -rw-r--r-- | skia/ports/SkImageDecoder_Factory.cpp | 6 | ||||
| -rw-r--r-- | skia/skia.vsprops | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/skia/SConscript b/skia/SConscript index 776da05..789006f 100644 --- a/skia/SConscript +++ b/skia/SConscript @@ -19,7 +19,7 @@ env.Prepend( env.Append( CPPDEFINES = [ - 'SKIA_DISABLE_SUPPORT_FOR_DECODERS', + 'SK_BUILD_NO_IMAGE_ENCODE', ], ) @@ -303,6 +303,7 @@ input_files = ChromeFileList([ 'sgl/SkTSearch.cpp', 'sgl/SkTSort.h', 'sgl/SkTypeface_fake.cpp', + 'sgl/SkUnPreMultiply.cpp', 'sgl/SkUtils.cpp', 'sgl/SkWriter32.cpp', 'sgl/SkXfermode.cpp', @@ -415,6 +416,7 @@ if env.Bit('linux'): if env.Bit('posix'): input_files.append('ports/SkThread_pthread.cpp') + input_files.append('ports/SkTime_Unix.cpp') if env.Bit('mac'): input_files.append('ext/bitmap_platform_device_mac.cc') diff --git a/skia/ports/SkImageDecoder_Factory.cpp b/skia/ports/SkImageDecoder_Factory.cpp index d5d7b3f..585957c 100644 --- a/skia/ports/SkImageDecoder_Factory.cpp +++ b/skia/ports/SkImageDecoder_Factory.cpp @@ -34,12 +34,14 @@ struct CodecFormat { }; static const CodecFormat gPairs[] = { +#ifdef SK_SUPPORT_IMAGE_DECODE { SkImageDecoder_GIF_Factory, SkImageDecoder::kGIF_Format }, { SkImageDecoder_PNG_Factory, SkImageDecoder::kPNG_Format }, { SkImageDecoder_ICO_Factory, SkImageDecoder::kICO_Format }, { SkImageDecoder_WBMP_Factory, SkImageDecoder::kWBMP_Format }, { SkImageDecoder_BMP_Factory, SkImageDecoder::kBMP_Format }, { SkImageDecoder_JPEG_Factory, SkImageDecoder::kJPEG_Format } +#endif }; SkImageDecoder* SkImageDecoder::Factory(SkStream* stream) { @@ -73,11 +75,15 @@ extern SkMovie* SkMovie_GIF_StreamFactory(SkStream*); extern SkMovie* SkMovie_GIF_MemoryFactory(const void*, size_t); static const SkMovieStreamProc gStreamProc[] = { +#ifdef SK_SUPPORT_IMAGE_DECODE SkMovie_GIF_StreamFactory +#endif }; static const SkMovieMemoryProc gMemoryProc[] = { +#ifdef SK_SUPPORT_IMAGE_DECODE SkMovie_GIF_MemoryFactory +#endif }; SkMovie* SkMovie::DecodeStream(SkStream* stream) { diff --git a/skia/skia.vsprops b/skia/skia.vsprops index bfc11b1..f9a825b 100644 --- a/skia/skia.vsprops +++ b/skia/skia.vsprops @@ -8,7 +8,7 @@ <Tool Name="VCCLCompilerTool" AdditionalIncludeDirectories="include;include\corecg;corecg;sgl;picture" - PreprocessorDefinitions="SKIA_DISABLE_SUPPORT_FOR_DECODERS" + PreprocessorDefinitions="SK_BUILD_NO_IMAGE_ENCODE" DisableSpecificWarnings="4244; 4267; 4345; 4390; 4554; 4800" /> </VisualStudioPropertySheet> |