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

Side by Side Diff: gears/SConscript.browser

Issue 16586: Update Gears to r3147, and fix scons build to match. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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 | « gears/SConscript ('k') | gears/SConscript.googleurl » ('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) 2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import utils 6 import utils
7 7
8 Import('env') 8 Import('env')
9 9
10 env = env.Clone() 10 env = env.Clone()
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 ], 200 ],
201 LIBPATH = [ 201 LIBPATH = [
202 '$OPEN_DIR/tools/osx' 202 '$OPEN_DIR/tools/osx'
203 ], 203 ],
204 ) 204 )
205 205
206 # Add in libraries for in-development APIs for non-official builds. 206 # Add in libraries for in-development APIs for non-official builds.
207 if not env['OFFICIAL_BUILD']: 207 if not env['OFFICIAL_BUILD']:
208 env.Append(LIBS = [ 208 env.Append(LIBS = [
209 'jpeg-gears', 209 'jpeg-gears',
210 'portaudio',
211 'gd', 210 'gd',
212 ]) 211 ])
213 212
214 # Except on these platforms. 213 # Except on these platforms.
215 if env['OS'] == 'wince': 214 if env['OS'] == 'wince':
216 env.FilterOut(LIBS = [ 215 env.FilterOut(LIBS = [
217 'gd', 216 'gd',
218 'jpeg-gears', 217 'jpeg-gears',
219 ]) 218 ])
220 219
221 if env['OS'] == 'android': 220 if env['OS'] == 'android':
222 env.Append(LIBS = [ 221 env.Append(LIBS = [
223 'mozjs-gears', 222 'mozjs-gears',
224 ]) 223 ])
225 env.FilterOut(LIBS = [ 224 env.FilterOut(LIBS = [
226 'googleurl-gears', 225 'googleurl-gears',
227 'sqlite-gears', 226 'sqlite-gears',
228 'portaudio',
229 'png-gears', 227 'png-gears',
230 'zlib-gears', 228 'zlib-gears',
231 'jpeg-gears', 229 'jpeg-gears',
232 'gd', 230 'gd',
233 ]) 231 ])
234 232
235 if env['BROWSER'] == 'IE': 233 if env['BROWSER'] == 'IE':
236 if env['OS'] == 'win32': 234 if env['OS'] == 'win32':
237 env.Append( 235 env.Append(
238 LIBS = [ 236 LIBS = [
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 539
542 if env['BROWSER'] == 'SF': 540 if env['BROWSER'] == 'SF':
543 outputs['PROXY_DLL'] = env.ChromeSharedLibrary('gears_proxy', 541 outputs['PROXY_DLL'] = env.ChromeSharedLibrary('gears_proxy',
544 GetInputs('$SF_PROXY_DLL_CPPSRCS')) 542 GetInputs('$SF_PROXY_DLL_CPPSRCS'))
545 outputs['INPUTMANAGER_EXE'] = env.ChromeProgram('GearsEnabler', 543 outputs['INPUTMANAGER_EXE'] = env.ChromeProgram('GearsEnabler',
546 GetInputs('$SF_INPUTMANAGER_CPPSRCS'), 544 GetInputs('$SF_INPUTMANAGER_CPPSRCS'),
547 FRAMEWORKS = env['FRAMEWORKS'] + Split('Foundation AppKit')) 545 FRAMEWORKS = env['FRAMEWORKS'] + Split('Foundation AppKit'))
548 546
549 # See main SConscript for how 'outputs' is used. 547 # See main SConscript for how 'outputs' is used.
550 Return('outputs') 548 Return('outputs')
OLDNEW
« no previous file with comments | « gears/SConscript ('k') | gears/SConscript.googleurl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698