Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1231)

Unified Diff: chrome/chrome.gyp

Issue 155015: Make workers functional on OSX and Linux. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/chrome.gyp
===================================================================
--- chrome/chrome.gyp (revision 20549)
+++ chrome/chrome.gyp (working copy)
@@ -15,6 +15,7 @@
'debugger',
'renderer',
'utility',
+ 'worker',
'../printing/printing.gyp:printing',
'../webkit/webkit.gyp:inspector_resources',
],
@@ -2429,13 +2430,6 @@
'third_party/wtl/include',
],
},],
- # As of yet unported-from-Windows code.
- ['OS!="win"', {
- 'sources!': [
- 'renderer/webworker_proxy.cc',
- 'renderer/webworker_proxy.h',
- ],
- },],
],
},
{
@@ -2471,6 +2465,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',
@@ -4913,40 +4941,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.

Powered by Google App Engine
This is Rietveld 408576698