diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-19 16:39:48 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-19 16:39:48 +0000 |
| commit | 88ae1403f74c34e171f80b1533a38f7d5a8abf4f (patch) | |
| tree | 1b1ce07231fa5ea2870d8bc36d53d59fa68336a1 | |
| parent | 94ee65445a5b30d0c8bdbb7c655893a0897fb46a (diff) | |
| download | chromium_src-88ae1403f74c34e171f80b1533a38f7d5a8abf4f.zip chromium_src-88ae1403f74c34e171f80b1533a38f7d5a8abf4f.tar.gz chromium_src-88ae1403f74c34e171f80b1533a38f7d5a8abf4f.tar.bz2 | |
Make sure webkit/port and webkit/glue are in lower case because libGlue.a looks funny.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2410 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/SConscript | 4 | ||||
| -rw-r--r-- | chrome/SConscript.unit_tests | 8 | ||||
| -rw-r--r-- | webkit/glue/SConscript | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/SConscript | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index cef80b4c..3775688 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -117,9 +117,9 @@ env_dll.Append( 'V8Bindings', 'WebCore', 'default_plugin', - 'Glue', + 'glue', 'JavaScriptCore_pcre', - 'Port', + 'port', ], ) diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests index 0c55802..afd6eaa 100644 --- a/chrome/SConscript.unit_tests +++ b/chrome/SConscript.unit_tests @@ -41,7 +41,7 @@ env_test.Prepend( # On Linux, dependencies must come after the libraries that depend on it. # base must come after net, bzip2 must come before base, etc. LIBS = [ - 'net', + 'net', # On Linux, dependencies must follow dependents. 'bzip2', 'base', 'base_gfx', @@ -60,8 +60,9 @@ env_test.Prepend( 'WTF', 'V8Bindings', 'default_plugin', - 'Glue', + 'glue', 'JavaScriptCore_pcre', + 'port', ], ) @@ -70,7 +71,6 @@ if env_test['PLATFORM'] == 'win32': env_test.Prepend( LIBS = [ 'WebCore', - 'Port', ], ) @@ -109,7 +109,6 @@ if env_test['PLATFORM'] == 'win32': 'browser/browser.lib', 'browser/views/browser_views.lib', 'browser/debugger/debugger.lib', - 'common/common.lib', 'installer/util/util.lib', 'libjscre.lib', 'plugin/plugin.lib', @@ -258,4 +257,3 @@ if env_test['PLATFORM'] in ('posix', 'win32'): i = env_test.Install('$TARGET_ROOT', unit_tests) Alias('chrome', i) - diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript index cccc1df..24c1036 100644 --- a/webkit/glue/SConscript +++ b/webkit/glue/SConscript @@ -83,4 +83,4 @@ if env['PLATFORM'] == 'win32': 'webwidget_impl.cc', ]) -env.ChromeStaticLibrary('Glue', input_files) +env.ChromeStaticLibrary('glue', input_files) diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript index 301ef58..f031876 100644 --- a/webkit/tools/test_shell/SConscript +++ b/webkit/tools/test_shell/SConscript @@ -44,13 +44,13 @@ env.Append( 'zlib', 'v8', 'JavaScriptCore_pcre', - 'Port', + 'port', 'activex_shim', 'WTF', 'V8Bindings', 'WebCore', 'default_plugin', - 'Glue', + 'glue', ], ) |