Add a missing include path for the linux build of utils.gyp. Remove the Linux

utils files from the build of views.a, since they're already being compiled into
utils.a, since it was causing unnecessary rebuilds (the same could probably be
done for linux and mac).  Remove the commented-out SkImageDecoder_libpvjpeg.cpp,
which has been removed from SVN.

http://codereview.appspot.com/4532105/

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

diff --git a/gyp/images.gyp b/gyp/images.gyp
index ba3d6036545d52b551a0cb646dec981d0f69ca50..4e49f12e309b00fe076cdd4e296ed9cff5c91252 100644 (file)
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -34,8 +34,6 @@
         '../src/images/SkImageDecoder_libico.cpp',
         '../src/images/SkImageDecoder_libjpeg.cpp',
         '../src/images/SkImageDecoder_libpng.cpp',
-        # This file wasn't being compiled, and seems to have bitrotted.
-        #'../src/images/SkImageDecoder_libpvjpeg.cpp',
         '../src/images/SkImageDecoder_wbmp.cpp',
         '../src/images/SkImageEncoder.cpp',
         '../src/images/SkImageEncoder_Factory.cpp',

diff --git a/gyp/utils.gyp b/gyp/utils.gyp
index 2e5308b5e070511217f3fd663fab023779cc62d9..edc314e2bcdc61a3f3987dc3161b60480cab0852 100644 (file)
--- a/gyp/utils.gyp
+++ b/gyp/utils.gyp
@@ -10,6 +10,7 @@
         '../include/config',
         '../include/core',
         '../include/utils',
+        '../include/utils/unix',
         '../include/views',
         '../include/effects',
         '../include/xml',
@@ -94,6 +95,9 @@
             '../src/utils/unix/SkEGLContext_Unix.cpp',
             '../src/utils/unix/SkOSWindow_Unix.cpp',
           ],
+          'include_dirs!': [
+            '../include/utils/unix',
+          ],
         }],
         [ 'OS != "win"', {
           'sources!': [

diff --git a/gyp/views.gyp b/gyp/views.gyp
index 7c95a761ad1cd9be7d7fd53435ad81bd7509f1ee..4e9b19fad3b21bfd83291a89f1fe000bf72347dc 100644 (file)
--- a/gyp/views.gyp
+++ b/gyp/views.gyp
@@ -96,12 +96,7 @@
           },
         }],
         [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-          'include_dirs' : [
-            '../include/utils/unix',
-          ],
           'sources': [
-            '../src/utils/unix/keysym2ucs.c',
-            '../src/utils/unix/SkOSWindow_Unix.cpp',
             '../unix_test_app/main.cpp',
           ],
         }],