diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-05 13:38:27 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-04-05 13:38:27 +0000 |
| commit | 7800e3008fe87d0b3a8d33c01711f328135131c4 (patch) | |
| tree | 244d231ea4591972ab89d60f111e9c4f22a18c8b | |
| parent | 7c545bddf806fc1b2e9ce61a9888b49d60471d73 (diff) | |
Rolling back r3611 until the Android compilation issue is resolved
git-svn-id: http://skia.googlecode.com/svn/trunk@3613 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/gmslides.gypi | 1 | ||||
| -rw-r--r-- | gyp/images.gyp | 16 | ||||
| -rw-r--r-- | gyp/libjpeg.gyp | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index 8442d7d2fc..491af68e64 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -14,7 +14,6 @@ '../gm/complexclip2.cpp', '../gm/convexpaths.cpp', '../gm/cubicpaths.cpp', - '../gm/cmykjpeg.cpp', '../gm/degeneratesegments.cpp', '../gm/drawbitmaprect.cpp', '../gm/emptypath.cpp', diff --git a/gyp/images.gyp b/gyp/images.gyp index b92c9db34d..a4bdcd00ff 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -4,12 +4,9 @@ 'target_name': 'images', 'type': 'static_library', 'dependencies': [ - 'libjpeg.gyp:*', + 'libjpeg.gyp:libjpeg', 'utils.gyp:utils', ], - 'export_dependent_settings': [ - 'libjpeg.gyp:*', - ], 'include_dirs': [ '../include/config', '../include/core', @@ -31,7 +28,6 @@ '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_Factory.cpp', - '../src/images/SkImageDecoder_libjpeg.cpp', '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libico.cpp', @@ -56,11 +52,14 @@ 'conditions': [ [ 'skia_os == "win"', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkFDStream.cpp', '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], 'link_settings': { @@ -75,10 +74,13 @@ }], [ 'skia_os == "mac"', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkImageDecoder_Factory.cpp', '../src/images/SkImageDecoder_libpng.cpp', '../src/images/SkImageDecoder_libgif.cpp', '../src/images/SkImageEncoder_Factory.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], },{ #else if skia_os != mac @@ -88,7 +90,10 @@ }], [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', { 'sources!': [ + '../include/images/SkJpegUtility.h', + '../src/images/SkImageDecoder_libgif.cpp', + '../src/images/SkJpegUtility.cpp', '../src/images/SkMovie_gif.cpp', ], # libpng stuff: @@ -107,6 +112,7 @@ }], [ 'skia_os == "android"', { 'sources!': [ + '../src/images/SkJpegUtility.cpp', ], 'dependencies': [ 'android_system.gyp:gif', diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp index dcf14509a2..b7ce7a8114 100644 --- a/gyp/libjpeg.gyp +++ b/gyp/libjpeg.gyp @@ -76,7 +76,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../third_party/externals/libjpeg', + '.', ], }, 'conditions': [ |