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

Unified Diff: gears/SConscript.browser

Issue 18299: Changes to make it possible to statically link Gears. This is disabled by an... (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gears/SConscript ('k') | webkit/glue/plugins/plugin_lib_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gears/SConscript.browser
===================================================================
--- gears/SConscript.browser (revision 8198)
+++ gears/SConscript.browser (working copy)
@@ -503,14 +503,17 @@
if env['OS'] in ['win32', 'wince'] and env['MODE'] == 'dbg':
outputs['MODULE_PDB'] = env.InstallAs('gears.pdb',
'gears-$OS-$ARCH-$MODE-${BROWSER}.pdb')
- env.Alias('gears', outputs['MODULE_PDB'])
-env.Alias('gears', outputs['MODULE'])
-if env['OS'] == 'win32' and env['BROWSER'] == 'NPAPI':
- lib = env.ChromeLibrary('gears-static',
- env.SharedObject(GetInputs('$BROWSER_CPPSRCS')) +
- GetInputs('$BROWSER_LINKSRCS'))
- env.Alias('gears-static', lib)
+if env['GEARS_STATIC_LIB']:
+ if env['OS'] == 'win32' and env['BROWSER'] == 'NPAPI':
+ lib = env.ChromeLibrary('gears-static',
+ env.SharedObject(GetInputs('$BROWSER_CPPSRCS')) +
+ GetInputs('$BROWSER_LINKSRCS'))
+ env.Alias('gears', lib)
+else:
+ env.Alias('gears', outputs['MODULE'])
+ if 'MODULE_PDB' in outputs:
+ env.Alias('gears', outputs['MODULE_PDB'])
if env['OS'] == 'wince':
env.Append(WINCE_SETUP_LINKSRCS = [
« no previous file with comments | « gears/SConscript ('k') | webkit/glue/plugins/plugin_lib_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698