diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 17:09:26 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-25 17:09:26 +0000 |
| commit | 172914a2c17f67ace61f554e1b41fbe8051fc7c4 (patch) | |
| tree | 8f494e14fd3a132a7b207ef45e466231a3a14c94 /gears/SConscript.googleurl | |
| parent | e8f72307e44a0a9812c05015228bd6f90f664b47 (diff) | |
| download | chromium_src-172914a2c17f67ace61f554e1b41fbe8051fc7c4.zip chromium_src-172914a2c17f67ace61f554e1b41fbe8051fc7c4.tar.gz chromium_src-172914a2c17f67ace61f554e1b41fbe8051fc7c4.tar.bz2 | |
Clean up Gears SConscripts a bit. Try to match the build flags from the
Makefile more closely.
Review URL: http://codereview.chromium.org/4266
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears/SConscript.googleurl')
| -rw-r--r-- | gears/SConscript.googleurl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gears/SConscript.googleurl b/gears/SConscript.googleurl index a8aef1a..865ba03 100644 --- a/gears/SConscript.googleurl +++ b/gears/SConscript.googleurl @@ -8,6 +8,7 @@ env = env.Clone() env.Replace( GURL_DIR = '$THIRD_PARTY_DIR/googleurl', + ICU38_DIR = '$THIRD_PARTY_DIR/icu38', CPPPATH = [ '$GURL_DIR', '$GURL_DIR/..', @@ -19,7 +20,7 @@ env.Replace( env.Append( CPPDEFINES = [ - 'U_STATIC_IMPLEMENTATION', +# 'U_STATIC_IMPLEMENTATION', ], ) @@ -36,7 +37,7 @@ input_files = [ '$GURL_DIR/src/url_canon_etc.cc', '$GURL_DIR/src/url_canon_fileurl.cc', '$GURL_DIR/src/url_canon_host.cc', - '$GURL_DIR/src/url_canon_icu.cc', +# '$GURL_DIR/src/url_canon_icu.cc', '$GURL_DIR/src/url_canon_internal.cc', '$GURL_DIR/src/url_canon_ip.cc', # '$GURL_DIR/src/url_canon_mailtourl.cc', @@ -50,6 +51,11 @@ input_files = [ '$GURL_DIR/src/url_util.cc', ] +# ICU files needed for Gears. +input_files += [ + '$ICU38_DIR/source/common/utf_impl.cc', +] + env.ChromeStaticLibrary('googleurl-gears', input_files) #env_tests = env.Clone() |