Redelivering r3611 changes (enabling cmyk jpeg changes in .gyps)

http://codereview.appspot.com/5967047/

git-svn-id: http://skia.googlecode.com/svn/trunk@3617 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi
index 491af68..8442d7d 100644 (file)
--- a/gyp/gmslides.gypi
+++ b/gyp/gmslides.gypi
@@ -14,6 +14,7 @@
     '../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 a4bdcd0..b92c9db 100644 (file)
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -4,9 +4,12 @@
       'target_name': 'images',
       'type': 'static_library',
       'dependencies': [
-        'libjpeg.gyp:libjpeg',
+        'libjpeg.gyp:*',
         'utils.gyp:utils',
       ],
+      'export_dependent_settings': [
+        'libjpeg.gyp:*',
+      ],
       'include_dirs': [
         '../include/config',
         '../include/core',
@@ -28,6 +31,7 @@
         '../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',
@@ -52,14 +56,11 @@
       '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': {
@@ -74,13 +75,10 @@
         }],
         [ '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
@@ -90,10 +88,7 @@
         }],
         [ '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:
@@ -112,7 +107,6 @@
         }],
         [ 'skia_os == "android"', {
           'sources!': [
-            '../src/images/SkJpegUtility.cpp',
           ],
           'dependencies': [
              'android_system.gyp:gif',

diff --git a/gyp/libjpeg.gyp b/gyp/libjpeg.gyp
index b7ce7a8..dcf1450 100644 (file)
--- a/gyp/libjpeg.gyp
+++ b/gyp/libjpeg.gyp
@@ -76,7 +76,7 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '.',
+              '../third_party/externals/libjpeg',
             ],
           },
           'conditions': [