Changes to make it possible to statically link Gears. This is disabled by an...

gears/SConscript

 # Copyright (c) 2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Notes:
 # This is the main Gears SConscript file.  From here, we include sub-scripts
 # that handle building various targets (third party libs, common exes, the
 # browser plugins themselves, and installers).  Some sub-scripts return a
 # dictionary of variables to be appended to the environment, so other
 # sub-scripts can use them.
@@ skipping 56 matching lines @@
     'symbian': ['NPAPI'],
 }
 
 vars = Variables(None, ARGUMENTS)
 vars.AddVariables(
     EnumVariable('OS',
         'Which OS is the target', os_guess, os_browsers_map.keys()),
     EnumVariable('MODE',
         'Type of binary to generate', 'dbg', ['dbg', 'opt']),
     BoolVariable('OFFICIAL_BUILD',
-        'Create a binary suitable for public release', 0)
+        'Create a binary suitable for public release', 0),
+    BoolVariable('GEARS_STATIC_LIB',
+        'Create a static library for linking with Chrome', 0),
 )
 vars.Update(env)
 
 env['VALID_BROWSERS'] = os_browsers_map[env['OS']]
 
 # Add BROWSER last, since its valid inputs depend on $OS.
 vars.Add(
     EnumVariable('BROWSER',
         'Which browser we want to build the plugin for.  "all" builds all '
         'browsers for this OS.',
@@ skipping 254 matching lines @@
 if env['USING_CCTESTS']:
   env.Append(
       CPPDEFINES = 'USING_CCTESTS=1',
       M4FLAGS = '-DUSING_CCTESTS=1',
   )
 if env['OFFICIAL_BUILD']:
   env.Append(
       CPPDEFINES = 'OFFICIAL_BUILD=1',
       M4FLAGS = '-DOFFICIAL_BUILD=1',
   )
+if env['GEARS_STATIC_LIB']:
+  env.Append(
+      CPPDEFINES = 'GEARS_STATIC_LIB=1',
+  )
 
 # TODO: if USING_LIBPNG
 env.Append(
     CPPDEFINES = [
         'PNG_USER_CONFIG',
         'CHROME_PNG_WRITE_SUPPORT',
-        'GEARS_PNG_BUILD',
     ]
 )
+if not env['GEARS_STATIC_LIB']:
+  # If we're not linking with Chrome, don't prefix all the symbols with
+  # webkit_.
+  env.Append(CPPDEFINES = ['GEARS_PNG_BUILD'])
+
+
 # TODO: if USING_ZLIB
 env.Append(
     CPPDEFINES = [
         'NO_GZIP',
         'NO_GZCOMPRESS',
     ]
 )
 if env['OS'] == 'wince':
   env.Append(CPPDEFINES = 'NO_ERRNO_H')
 
@@ skipping 90 matching lines @@
       ],
       SHLINKFLAGS = [
           '/DLL',
 # Set the preferred base address.  This value was chosen because (a) it's near
 # the top of the valid address range, and (b) it doesn't conflict with other
 # DLLs loaded by Chrome in either the browser or plugin process.
           '/BASE:0x65000000',
       ],
       CPPFLAGS = [
           '/nologo',
-          '/Zc:wchar_t-',
           '/c',
           '/W3',
           '/WX',
           '/GR-',
           '/Fd"${TARGET.base}.pdb"',
       ],
       CXXFLAGS = [
           '/TP',
           '/J',
       ],
@@ skipping 111 matching lines @@
         CPPFLAGS = [
           '/MT',
           '/O2',
         ],
         COMMON_LINKFLAGS = [
           '/INCREMENTAL:NO',
           '/OPT:REF',
           '/OPT:ICF',
         ],
     )
+  if not env['GEARS_STATIC_LIB']:
+    # Build with 2-byte wchar_t's only if we're building a DLL.  To link with
+    # Chrome, we need 4-byte wchar_t.
+    env.Append(
+        CPPFLAGS = [
+          '/Zc:wchar_t-',
+        ],
+    )
+        
 #--------------------------- LINUX ---------------------------
 elif env['OS'] == 'linux':
   env.Append(
       CPPDEFINES = [
           'LINUX',
       ],
       CPPPATH = [
           '$THIRD_PARTY_DIR/gtk/include/gtk-2.0',
           '$THIRD_PARTY_DIR/gtk/include/atk-1.0',
           '$THIRD_PARTY_DIR/gtk/include/glib-2.0',
@@ skipping 351 matching lines @@
   env.Append(**browser_outputs)
 
 # Note: even though the installers write to $INSTALLER_OUTDIR, they need to
 # read files from other dirs, so we give them a variant_dir at the toplevel.
 env.SConscript('SConscript.installers',
                exports=['env'],
                variant_dir='$BASE_OUTDIR',
                duplicate=0)
 
 env.Alias('gears-installers', 'gears')