diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 22:56:42 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-09 22:56:42 +0000 |
| commit | 19acec58876633bff72e7ffd657b36a768f3bba5 (patch) | |
| tree | 05f3c851e219ab8b67d03a7545cee0e260bf9313 /webkit/webkit.gyp | |
| parent | 3daae9f20e7f07a903ab420415cdae9599f2b544 (diff) | |
| download | chromium_src-19acec58876633bff72e7ffd657b36a768f3bba5.zip chromium_src-19acec58876633bff72e7ffd657b36a768f3bba5.tar.gz chromium_src-19acec58876633bff72e7ffd657b36a768f3bba5.tar.bz2 | |
Snapshotting progress.
Got app and unit_tests linking with gyp under windows.
Still missing pieces (things don't run).
Review URL: http://codereview.chromium.org/39319
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/webkit.gyp')
| -rw-r--r-- | webkit/webkit.gyp | 60 |
1 files changed, 43 insertions, 17 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 77c2b62..de36f17 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -4113,12 +4113,45 @@ ], }, { + 'target_name': 'webkit_resources', + 'type': 'none', + 'dependencies': [ + 'webcore', + 'webkit', + '../net/net.gyp:net', + ], + 'rules': [ + { + 'rule_name': 'grit', + 'extension': 'grd', + 'inputs': [ + '../tools/grit/grit.py', + ], + 'outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h', + ], + 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'], + }, + ], + 'sources': [ + # grit rule + 'glue/webkit_resources.grd', + 'glue/webkit_strings.grd', + ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit', + ], + }, + }, + { 'target_name': 'glue', 'type': 'static_library', 'dependencies': [ 'webcore', 'webkit', '../net/net.gyp:net', + 'webkit_resources', ], 'actions': [ { @@ -4133,19 +4166,6 @@ 'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'], }, ], - 'rules': [ - { - 'rule_name': 'grit', - 'extension': 'grd', - 'inputs': [ - '../tools/grit/grit.py', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/webkit/grit/<(RULE_INPUT_ROOT).h', - ], - 'action': ['python', '<@(_inputs)', '-i', '<(RULE_INPUT_PATH)', 'build', '-o', '<(SHARED_INTERMEDIATE_DIR)/webkit'], - }, - ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', ], @@ -4153,10 +4173,6 @@ # webkit_version rule '../third_party/WebKit/WebCore/Configurations/Version.xcconfig', - # grit rule - 'glue/webkit_resources.grd', - 'glue/webkit_strings.grd', - # This list contains all .h, .cc, and .mm files in glue except for # those in the test subdirectory and those with unittest in in their # names. @@ -4342,6 +4358,11 @@ 'glue/webwidget_delegate.h', 'glue/webwidget_impl.cc', 'glue/webwidget_impl.h', + 'glue/webworker.h', + 'glue/webworker_impl.cc', + 'glue/webworker_impl.h', + 'glue/webworkerclient_impl.cc', + 'glue/webworkerclient_impl.h', 'glue/window_open_disposition.h', 'pending/AccessibleBase.cpp', 'pending/AccessibleBase.h', @@ -4381,6 +4402,11 @@ 'glue/plugins/webplugin_delegate_impl.cc', 'glue/glue_accessibility.cc', 'glue/webdropdata.cc', + 'glue/webworker.h', + 'glue/webworker_impl.cc', + 'glue/webworker_impl.h', + 'glue/webworkerclient_impl.cc', + 'glue/webworkerclient_impl.h', 'pending/AccessibleBase.cpp', 'pending/AccessibleDocument.cpp', ], |