diff options
| author |  senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-20 19:46:42 +0000 |
|---|---|---|
| committer | senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-06-20 19:46:42 +0000 |
| commit | 52bbe140a382806ca159970539b3126f977f64b9 (patch) | |
| tree | 4dd26a886cc2ff8c0bb66bfd7d1e64f472cb6326 /gyp | |
| parent | 2d7a60d8dfb486640a020ac629c466a111cae525 (diff) | |
Remove some files from views.gyp that already being compiled into utils.gyp
(already done for Linux, this change does the same for Mac and Win).
Review URL: http://codereview.appspot.com/4575044/
git-svn-id: http://skia.googlecode.com/svn/trunk@1654 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gyp | 3 | ||||
| -rw-r--r-- | gyp/images.gyp | 3 | ||||
| -rw-r--r-- | gyp/views.gyp | 18 |
3 files changed, 0 insertions, 24 deletions
diff --git a/gyp/core.gyp b/gyp/core.gyp index b5bc962122..ba63485385 100644 --- a/gyp/core.gyp +++ b/gyp/core.gyp @@ -289,9 +289,6 @@ '../src/ports/SkThread_pthread.cpp', '../src/ports/SkTime_Unix.cpp', - - # TODO(epoger): why are we building this here? - '../src/utils/mac/SkCreateCGImageRef.cpp', ], 'link_settings': { 'libraries': [ diff --git a/gyp/images.gyp b/gyp/images.gyp index e052f1e34d..ba05a07fe2 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -97,9 +97,6 @@ # our code that calls it. # See http://code.google.com/p/gyp/wiki/InputFormatReference#Dependent_Settings 'link_settings': { - 'sources': [ - '../src/images/SkImageDecoder_libpng.cpp', - ], 'libraries': [ '-lpng', ], diff --git a/gyp/views.gyp b/gyp/views.gyp index 02059a4b4d..6ba42bf21f 100644 --- a/gyp/views.gyp +++ b/gyp/views.gyp @@ -73,25 +73,7 @@ '../src/views/SkListWidget.cpp', #depends on missing SkListSource implementation ], 'conditions': [ - [ 'OS == "win"', { - 'sources': [ - '../src/utils/win/SkOSWindow_Win.cpp', - '../src/utils/win/skia_win.cpp', - ], - }], [ 'OS == "mac"', { - # TODO(epoger): why are we building these here instead of inheriting - # them from utils.gyp? - 'sources': [ - '../include/utils/SkCGUtils.h', - '../src/utils/mac/SkCreateCGImageRef.cpp', - '../src/utils/mac/SkEGLContext_mac.cpp', - '../src/utils/mac/skia_mac.cpp', - '../src/utils/mac/SkOSWindow_Mac.cpp', - ], - 'include_dirs': [ - '../include/utils/mac', - ], 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Carbon.framework', |