diff options
author | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 04:38:25 +0000 |
---|---|---|
committer | evanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-26 04:38:25 +0000 |
commit | de2c4cca42e52e97d240f6de1dbc8094777f9871 (patch) | |
tree | 0d5bd659b3a6da4cdfa1831e174a730d12769595 /webkit | |
parent | 1c4fdfb4145e39979c5095546ced9f07578ccb4d (diff) | |
download | chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.zip chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.tar.gz chromium_src-de2c4cca42e52e97d240f6de1dbc8094777f9871.tar.bz2 |
Mass convert ChromeStaticLibrary -> ChromeLibrary, including pulling the updated ICU dep that uses it as well.
Add a SHARED scons command-line flag to build shared libraries.
Review URL: http://codereview.chromium.org/16477
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/SConscript.javascriptcore_pcre | 2 | ||||
-rw-r--r-- | webkit/SConscript.port | 2 | ||||
-rw-r--r-- | webkit/activex_shim/SConscript | 2 | ||||
-rw-r--r-- | webkit/build/JavaScriptCore/SConscript | 2 | ||||
-rw-r--r-- | webkit/build/V8Bindings/SConscript | 2 | ||||
-rw-r--r-- | webkit/build/WebCore/SConscript | 2 | ||||
-rw-r--r-- | webkit/default_plugin/SConscript | 2 | ||||
-rw-r--r-- | webkit/glue/SConscript | 2 | ||||
-rw-r--r-- | webkit/tools/test_shell/SConscript | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/webkit/SConscript.javascriptcore_pcre b/webkit/SConscript.javascriptcore_pcre index 6694b67..d30e771 100644 --- a/webkit/SConscript.javascriptcore_pcre +++ b/webkit/SConscript.javascriptcore_pcre @@ -49,7 +49,7 @@ input_files = [ '$PCRE_DIR/pcre_exec.cpp',
]
-env.ChromeStaticLibrary('JavaScriptCore_pcre', input_files)
+env.ChromeLibrary('JavaScriptCore_pcre', input_files)
env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/JavaScriptCore_pcre.vcproj',
guid='{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}')
diff --git a/webkit/SConscript.port b/webkit/SConscript.port index fdef9e4..d23902e 100644 --- a/webkit/SConscript.port +++ b/webkit/SConscript.port @@ -54,7 +54,7 @@ else: '$PORT_DIR/bindings/v8/ScriptController.cpp',
])
-env.ChromeStaticLibrary("port", input_files)
+env.ChromeLibrary("port", input_files)
env.ChromeMSVSProject('$WEBKIT_DIR/build/port/port.vcproj',
name = 'Port',
diff --git a/webkit/activex_shim/SConscript b/webkit/activex_shim/SConscript index 41faa5d..b136c16 100644 --- a/webkit/activex_shim/SConscript +++ b/webkit/activex_shim/SConscript @@ -39,7 +39,7 @@ input_files = [ 'web_activex_site.cc', ] -env.ChromeStaticLibrary('activex_shim', input_files) +env.ChromeLibrary('activex_shim', input_files) env.ChromeMSVSProject('$WEBKIT_DIR/activex_shim/activex_shim.vcproj', dependencies = [ diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript index 26a08ec..9fd54a6 100644 --- a/webkit/build/JavaScriptCore/SConscript +++ b/webkit/build/JavaScriptCore/SConscript @@ -173,7 +173,7 @@ elif env.Bit('linux'): env.ParseConfig('pkg-config --cflags --libs glib-2.0') -env.ChromeStaticLibrary('WTF', wtf_inputs) +env.ChromeLibrary('WTF', wtf_inputs) env.ChromeMSVSProject('$WEBKIT_DIR/build/JavaScriptCore/WTF.vcproj', guid='{AA8A5A85-592B-4357-BC60-E0E91E026AF6}') diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript index a1af82c..e238757 100644 --- a/webkit/build/V8Bindings/SConscript +++ b/webkit/build/V8Bindings/SConscript @@ -346,7 +346,7 @@ inputs = [ if env.Bit('windows'): inputs.append('precompiled_v8bindings.cpp') -env.ChromeStaticLibrary('V8Bindings', inputs) +env.ChromeLibrary('V8Bindings', inputs) env.ChromeMSVSProject('$WEBKIT_DIR/build/V8Bindings/V8Bindings.vcproj', dependencies = [ diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript index 621898e..517f170 100644 --- a/webkit/build/WebCore/SConscript +++ b/webkit/build/WebCore/SConscript @@ -951,7 +951,7 @@ if env.Bit('windows'): env.Append(CCPCHFLAGS = ['/FIprecompiled_webkit.h']) input_files += [obj] -env.ChromeStaticLibrary('WebCore', input_files) +env.ChromeLibrary('WebCore', input_files) env.ChromeMSVSProject('$WEBKIT_DIR/build/WebCore/WebCore.vcproj', dependencies = [ diff --git a/webkit/default_plugin/SConscript b/webkit/default_plugin/SConscript index 8b9047d..3c84f9a 100644 --- a/webkit/default_plugin/SConscript +++ b/webkit/default_plugin/SConscript @@ -50,7 +50,7 @@ if env.Bit('windows'): 'install_dialog.cc', ]) -env.ChromeStaticLibrary('default_plugin', input_files) +env.ChromeLibrary('default_plugin', input_files) env.ChromeMSVSProject('$WEBKIT_DIR/default_plugin/default_plugin.vcproj', dependencies = [ diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index 6670025..26a2d74 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -132,7 +132,7 @@ if env.Bit('posix'): 'plugins/plugin_stream_posix.cc', ]) -env.ChromeStaticLibrary('glue', input_files) +env.ChromeLibrary('glue', input_files) env.ChromeMSVSProject('$WEBKIT_DIR/build/glue/glue.vcproj', name = 'Glue', diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index d6e6bd6..f41ee88 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -132,7 +132,7 @@ elif env.Bit('linux'): 'test_webview_delegate_gtk.cc', ]) -lib = env.ChromeStaticLibrary('test_shell', input_files) +lib = env.ChromeLibrary('test_shell', input_files) env.Append(LIBS = ['test_shell']) |