diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 20:24:37 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-14 20:24:37 +0000 |
| commit | d3851d562a059cf52a7539c87aedf132a3b824bd (patch) | |
| tree | c61c56a9d5dcf64f44568d4e4d4141e26c834c74 /chrome/chrome.gyp | |
| parent | 4948090e4385c271a374e94baf43d2dcc4c230ce (diff) | |
| download | chromium_src-d3851d562a059cf52a7539c87aedf132a3b824bd.zip chromium_src-d3851d562a059cf52a7539c87aedf132a3b824bd.tar.gz chromium_src-d3851d562a059cf52a7539c87aedf132a3b824bd.tar.bz2 | |
Make workers functional on OSX and Linux.
BUG=http://crbug.com/16664
TEST=The same tests run for Web Workers on Windows should be run on Linux and OSX.
Review URL: http://codereview.chromium.org/155015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 76 |
1 files changed, 35 insertions, 41 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index c3b9092..d8193bf 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -15,6 +15,7 @@ 'debugger', 'renderer', 'utility', + 'worker', '../printing/printing.gyp:printing', '../webkit/webkit.gyp:inspector_resources', ], @@ -2439,13 +2440,6 @@ 'third_party/wtl/include', ], },], - # As of yet unported-from-Windows code. - ['OS!="win"', { - 'sources!': [ - 'renderer/webworker_proxy.cc', - 'renderer/webworker_proxy.h', - ], - },], ], }, { @@ -2481,6 +2475,40 @@ }], ], }, + { + 'target_name': 'worker', + 'type': '<(library)', + 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18', + 'dependencies': [ + '../base/base.gyp:base', + '../webkit/webkit.gyp:webkit', + ], + 'sources': [ + 'tools/build/win/precompiled.cc', + 'tools/build/win/precompiled.h', + + 'worker/nativewebworker_impl.cc', + 'worker/nativewebworker_impl.h', + 'worker/nativewebworker_stub.cc', + 'worker/nativewebworker_stub.h', + 'worker/webworkerclient_proxy.cc', + 'worker/webworkerclient_proxy.h', + 'worker/worker_main.cc', + 'worker/worker_thread.cc', + 'worker/worker_thread.h', + 'worker/worker_webkitclient_impl.cc', + 'worker/worker_webkitclient_impl.h', + ], + 'include_dirs': [ + '..', + ], + 'configurations': { + 'Debug': { + 'msvs_precompiled_header': 'tools/build/win/precompiled.h', + 'msvs_precompiled_source': 'tools/build/win/precompiled.cc', + }, + }, + }, { 'target_name': 'chrome', 'type': 'executable', @@ -4943,40 +4971,6 @@ }, }, }, - { - 'target_name': 'worker', - 'type': '<(library)', - 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18', - 'dependencies': [ - '../base/base.gyp:base', - '../webkit/webkit.gyp:webkit', - ], - 'sources': [ - 'tools/build/win/precompiled.cc', - 'tools/build/win/precompiled.h', - - 'worker/nativewebworker_impl.cc', - 'worker/nativewebworker_impl.h', - 'worker/nativewebworker_stub.cc', - 'worker/nativewebworker_stub.h', - 'worker/webworkerclient_proxy.cc', - 'worker/webworkerclient_proxy.h', - 'worker/worker_main.cc', - 'worker/worker_thread.cc', - 'worker/worker_thread.h', - 'worker/worker_webkitclient_impl.cc', - 'worker/worker_webkitclient_impl.h', - ], - 'include_dirs': [ - '..', - ], - 'configurations': { - 'Debug': { - 'msvs_precompiled_header': 'tools/build/win/precompiled.h', - 'msvs_precompiled_source': 'tools/build/win/precompiled.cc', - }, - }, - }, ]}, # 'targets' ], # OS=="win" # TODO(jrg): add in Windows code coverage targets. |