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

Side by Side Diff: chrome/SConscript

Issue 27157: Initial checkin of the out of process worker implementation.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import os 5 import os
6 6
7 Import(['env']) 7 Import(['env'])
8 8
9 env_res = env.Clone() 9 env_res = env.Clone()
10 env_test = env.Clone() 10 env_test = env.Clone()
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'Xrender', 135 'Xrender',
136 'Xext', 136 'Xext',
137 ], 137 ],
138 ) 138 )
139 139
140 if env.Bit('windows'): 140 if env.Bit('windows'):
141 # These libraries don't work on non-Windows yet. 141 # These libraries don't work on non-Windows yet.
142 env_dll.Append( 142 env_dll.Append(
143 LIBS = [ 143 LIBS = [
144 'plugin', 144 'plugin',
145 'worker',
145 ] 146 ]
146 ) 147 )
147 148
148 if env_dll.Bit('windows'): 149 if env_dll.Bit('windows'):
149 env_dll.Append( 150 env_dll.Append(
150 CCFLAGS = [ 151 CCFLAGS = [
151 '/TP', 152 '/TP',
152 '/Wp64', 153 '/Wp64',
153 ], 154 ],
154 CPPDEFINES = [ 155 CPPDEFINES = [
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 287
287 288
288 p = env.ChromeMSVSProject('app/chrome_dll.vcproj', 289 p = env.ChromeMSVSProject('app/chrome_dll.vcproj',
289 dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj', 290 dest='$CHROME_SRC_DIR/chrome/app/chrome_dll.vcproj',
290 guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}', 291 guid='{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}',
291 keyword='Win32Proj', 292 keyword='Win32Proj',
292 dependencies = [ 293 dependencies = [
293 '$BASE_DIR/build/base.vcproj', 294 '$BASE_DIR/build/base.vcproj',
294 '$WEBKIT_DIR/build/WebCore/WebCore.vcproj', 295 '$WEBKIT_DIR/build/WebCore/WebCore.vcproj',
295 '$CHROME_DIR/plugin/plugin.vcproj', 296 '$CHROME_DIR/plugin/plugin.vcproj',
297 '$CHROME_DIR/worker/worker.vcproj',
296 '$LIBJPEG_DIR/libjpeg.vcproj', 298 '$LIBJPEG_DIR/libjpeg.vcproj',
297 '$BZIP2_DIR/bzip2.vcproj', 299 '$BZIP2_DIR/bzip2.vcproj',
298 '$NET_DIR/build/net.vcproj', 300 '$NET_DIR/build/net.vcproj',
299 ('$WEBKIT_DIR/build/JavaScriptCore/' + 301 ('$WEBKIT_DIR/build/JavaScriptCore/' +
300 'JavaScriptCore_pcre.vcproj'), 302 'JavaScriptCore_pcre.vcproj'),
301 '$WEBKIT_DIR/build/port/port.vcproj', 303 '$WEBKIT_DIR/build/port/port.vcproj',
302 '$CHROME_DIR/browser/debugger/debugger.vcproj', 304 '$CHROME_DIR/browser/debugger/debugger.vcproj',
303 '$WEBKIT_DIR/default_plugin/default_plugin.vcproj' , 305 '$WEBKIT_DIR/default_plugin/default_plugin.vcproj' ,
304 '$CHROME_DIR/browser/browser.vcproj', 306 '$CHROME_DIR/browser/browser.vcproj',
305 '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', 307 '$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj',
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 ] 643 ]
642 644
643 # TODO(port) 645 # TODO(port)
644 if env.Bit('windows'): 646 if env.Bit('windows'):
645 env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins) 647 env.Install('$DESTINATION_ROOT/plugins/gears', gears_plugins)
646 648
647 env.Command('$DESTINATION_ROOT/resources/inspector', 649 env.Command('$DESTINATION_ROOT/resources/inspector',
648 '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end', 650 '$CHROME_SRC_DIR/third_party/WebKit/WebCore/inspector/front-end',
649 Copy('$TARGET', '$SOURCE'), 651 Copy('$TARGET', '$SOURCE'),
650 source_scanner=DirScanner) 652 source_scanner=DirScanner)
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_dll_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698