Revert 3538.

git-svn-id: http://skia.googlecode.com/svn/trunk@3539 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2012-03-29 14:51:56 +00:00
parent 29b63dc863
commit 5a64e58ebb
12 changed files with 44 additions and 77 deletions

View File

@ -7,17 +7,15 @@
{
'target_name': 'animator',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'effects.gyp:effects',
'images.gyp:images',
'ports.gyp:ports',
'utils.gyp:utils',
'views.gyp:views',
'xml.gyp:xml',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/effects',
'../include/animator',
'../include/views',
'../include/xml',
'../include/utils',
'../include/images',
'../src/utils',
],
'sources': [

View File

@ -5,10 +5,6 @@
'target_name': 'core',
'type': 'static_library',
'msvs_guid': 'B7760B5E-BFA8-486B-ACFD-49E3A6DE8E76',
'dependencies': [
'opts.gyp:opts',
'ports.gyp:ports',
],
'sources': [
'../src/core/ARGB32_Clamp_Bilinear_BitmapShader.h',
'../src/core/Sk64.cpp',
@ -314,6 +310,9 @@
'ext',
],
},
'dependencies': [
'opts.gyp:opts'
],
},
],
}

View File

@ -3,11 +3,9 @@
{
'target_name': 'effects',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'ports.gyp:ports',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/effects',
],
'sources': [

View File

@ -3,9 +3,9 @@
{
'target_name': 'experimental',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'ports.gyp:ports',
'include_dirs': [
'../include/config',
'../include/core',
],
'sources': [
'../experimental/SkSetPoly3To3.cpp',

View File

@ -86,12 +86,9 @@
{
'target_name': 'skgr',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'gpu.gyp:gr',
'ports.gyp:ports',
],
'include_dirs': [
'../include/config',
'../include/core',
'../src/core',
'../include/gpu',
],
@ -151,9 +148,7 @@
'../src/core', # SkRasterClip.h
],
'dependencies': [
'core.gyp:core',
'libtess.gyp:libtess',
'ports.gyp:ports',
],
'sources': [
'../include/gpu/GrClip.h',

View File

@ -4,12 +4,12 @@
'target_name': 'images',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'libjpeg.gyp:libjpeg',
'ports.gyp:ports',
'utils.gyp:utils',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/images',
],
'sources': [

View File

@ -21,16 +21,9 @@
{
'target_name': 'opts',
'type': 'static_library',
'dependencies': [
#opts depends on core, but core also depends on opts.
#'core.gyp:core',
'opts.gyp:opts_ssse3',
'ports.gyp:ports',
],
'include_dirs': [
'../include/config',
'../include/core',
'../src/core',
'../src/opts',
],
@ -88,15 +81,9 @@
{
'target_name': 'opts_ssse3',
'type': 'static_library',
'dependencies': [
#opts_ssse3 depends on core, but core also depends on opts_ssse3.
#'core.gyp:core',
'ports.gyp:ports',
],
'include_dirs': [
'../include/config',
'../include/core',
'../src/core',
],
'conditions': [

View File

@ -4,20 +4,13 @@
{
'target_name': 'ports',
'type': 'static_library',
'dependencies': [
#ports depends on core, but core also depends on ports.
#'core.gyp:core',
#ports depends on utils, but utils also depends on ports.
#'utils.gyp:utils',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/utils',
#ports currently implements the xml parser backend.
'../include/xml',
'../include/images',
'../include/effects',
'../include/ports',
'../include/xml',
'../src/core',
],
'sources': [

View File

@ -3,15 +3,15 @@
{
'target_name': 'utils',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'ports.gyp:ports',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/utils',
'../include/utils/mac',
'../include/utils/unix',
'../include/utils/win',
'../include/effects',
'../include/xml',
],
'sources': [
'../include/utils/SkBoundaryPatch.h',

View File

@ -9,16 +9,14 @@
{
'target_name': 'views',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'effects.gyp:effects',
'images.gyp:images',
'ports.gyp:ports',
'utils.gyp:utils',
'xml.gyp:xml',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/views',
'../include/xml',
'../include/utils',
'../include/images',
'../include/effects',
'../include/views/unix',
],
'sources': [

View File

@ -5,15 +5,16 @@
{
'target_name': 'views_animated',
'type': 'static_library',
'dependencies': [
'animator.gyp:animator',
'core.gyp:core',
'images.gyp:images',
'ports.gyp:ports',
'views.gyp:views',
'xml.gyp:xml',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/views',
'../include/xml',
'../include/utils',
'../include/images',
'../include/animator',
'../include/effects',
'../include/views/unix',
'../include/views/animated',
],
'sources': [

View File

@ -3,13 +3,11 @@
{
'target_name': 'xml',
'type': 'static_library',
'dependencies': [
'core.gyp:core',
'ports.gyp:ports',
'utils.gyp:utils',
],
'include_dirs': [
'../include/config',
'../include/core',
'../include/xml',
'../include/utils',
],
'sources': [
'../include/xml/SkBML_WXMLParser.h',