diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 22:58:52 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-16 22:58:52 +0000 |
| commit | efb07436b9ba4737247cdf0e8ba0529e27942468 (patch) | |
| tree | 8a96f13f3af49c7c15efe3e3db3e1727100f52de /gears/SConscript.browser | |
| parent | 39354f413433746b7f35135f85c1940210324eff (diff) | |
| download | chromium_src-efb07436b9ba4737247cdf0e8ba0529e27942468.zip chromium_src-efb07436b9ba4737247cdf0e8ba0529e27942468.tar.gz chromium_src-efb07436b9ba4737247cdf0e8ba0529e27942468.tar.bz2 | |
Changes to make it possible to statically link Gears. This is disabled by an
#ifdef.
This only partially works. Missing pieces:
- gears resources for HTML dialogs (permissions, shortcut, settings).
- able to compile with a non-official gears build.
Review URL: http://codereview.chromium.org/18299
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.browser')
| -rw-r--r-- | gears/SConscript.browser | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/gears/SConscript.browser b/gears/SConscript.browser index ffb0c30..c6b4d48 100644 --- a/gears/SConscript.browser +++ b/gears/SConscript.browser @@ -503,14 +503,17 @@ outputs['MODULE'] = env.InstallAs('${SHLIBPREFIX}gears${SHLIBSUFFIX}', module) 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 = [ |