diff options
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gyp | 21 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 22 |
2 files changed, 36 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/test_shell.gyp b/webkit/tools/test_shell/test_shell.gyp index f9a643e..2a31fff 100644 --- a/webkit/tools/test_shell/test_shell.gyp +++ b/webkit/tools/test_shell/test_shell.gyp @@ -181,14 +181,21 @@ }, 'conditions': [ ['OS=="win"', { - 'sources': [ '<@(test_shell_windows_resource_files)' ], + 'sources': [ + '<@(test_shell_windows_resource_files)', + # TODO: It would be nice to have these pulled in + # automatically from direct_dependent_settings in + # their various targets (net.gyp:net_resources, etc.), + # but that causes errors in other targets when + # resulting .res files get referenced multiple times. + '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_strings_en-US.rc', + ], }], ['OS=="linux"', { 'dependencies': [ '../../../build/linux/system.gyp:gtk', - '../../../net/net.gyp:net_resources', - '../../webkit.gyp:webkit_resources', - '../../webkit.gyp:webkit_strings', 'test_shell_resources', ], 'actions': [ @@ -239,6 +246,12 @@ 'process_outputs_as_mac_bundle_resources': 1, }, ] + }, { # OS != "mac" + 'dependencies': [ + '../../../net/net.gyp:net_resources', + '../../webkit.gyp:webkit_resources', + '../../webkit.gyp:webkit_strings', + ] }], ], }, diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 71308a6..026f6b8 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -324,9 +324,6 @@ 'sources!': [ # GLib/GTK, even though its name doesn't really indicate. '../third_party/WebKit/JavaScriptCore/wtf/GOwnPtr.cpp', - - 'build/precompiled_webkit.cc', - 'build/precompiled_webkit.h', ], 'sources/': [ ['exclude', '(Default|Gtk|Mac|None|Qt|Win|Wx)\\.(cpp|mm)$'], @@ -369,6 +366,11 @@ 'include_dirs!': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', ], + }, { # OS != "win" + 'sources!': [ + 'build/precompiled_webkit.cc', + 'build/precompiled_webkit.h', + ], }], ['OS=="linux"', { 'defines': ['WTF_USE_PTHREADS=1'], @@ -624,6 +626,7 @@ ], 'include_dirs': [ '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)/webkit', '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', 'port/bindings/v8', '<@(webcore_include_dirs)', @@ -3931,6 +3934,7 @@ ], 'direct_dependent_settings': { 'include_dirs': [ + '<(SHARED_INTERMEDIATE_DIR)/webkit', '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', 'port/bindings/v8', '<@(webcore_include_dirs)', @@ -4613,6 +4617,18 @@ { 'destination': '<(PRODUCT_DIR)/resources/inspector', 'files': [ + 'glue/devtools/js/base.js', + 'glue/devtools/js/debugger_agent.js', + 'glue/devtools/js/devtools.html', + 'glue/devtools/js/devtools.js', + 'glue/devtools/js/devtools_callback.js', + 'glue/devtools/js/devtools_host_stub.js', + 'glue/devtools/js/dom_agent.js', + 'glue/devtools/js/inject.js', + 'glue/devtools/js/inspector_controller.js', + 'glue/devtools/js/inspector_controller_impl.js', + 'glue/devtools/js/json.js', + 'glue/devtools/js/net_agent.js', 'inspector/debugger.css', 'inspector/debugger.html', 'inspector/DebuggerConsole.js', |