diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-31 14:27:55 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-31 14:27:55 +0000 |
| commit | d5936923addb492f02e4b341a8d225d6215af0d0 (patch) | |
| tree | beff43e009194fd46fa7f577167000457cd111d2 /src/images | |
| parent | 85322368cebe4f4233ef32d80bc2cc321396427c (diff) | |
Fix iOS build.
Review URL: https://codereview.chromium.org/15647010
git-svn-id: http://skia.googlecode.com/svn/trunk@9367 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/images')
| -rw-r--r-- | src/images/SkForceLinking.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/images/SkForceLinking.cpp b/src/images/SkForceLinking.cpp index c8ea1f98e6..e4dc60a448 100644 --- a/src/images/SkForceLinking.cpp +++ b/src/images/SkForceLinking.cpp @@ -20,10 +20,11 @@ int SkForceLinking(bool doNotPassTrue) { CreateICOImageDecoder(); CreateWBMPImageDecoder(); // Only link GIF and PNG on platforms that build them. See images.gyp -#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL) +#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_NACL) \ + && !defined(SK_BUILD_FOR_IOS) CreateGIFImageDecoder(); #endif -#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) +#if !defined(SK_BUILD_FOR_MAC) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_IOS) CreatePNGImageDecoder(); #endif return -1; |