diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 13:15:17 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 13:15:17 +0000 |
| commit | a449bc69a24a0a455ddfe2e99e398f3fe087c4fa (patch) | |
| tree | 4385544500ea03c29e5abaa172ed1621c8b718ec /third_party/libxml | |
| parent | 486b1999fbce99b437f44d1f5b10739a97b7211b (diff) | |
| download | chromium_src-a449bc69a24a0a455ddfe2e99e398f3fe087c4fa.zip chromium_src-a449bc69a24a0a455ddfe2e99e398f3fe087c4fa.tar.gz chromium_src-a449bc69a24a0a455ddfe2e99e398f3fe087c4fa.tar.bz2 | |
Roll the icu38 revision in the DEPS file to change the name of
our combined-build icuuc.lib to icu.lib.
Change solution file references accordingly.
Also change libxml patch and Makefile references
Review URL: http://codereview.chromium.org/4027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml')
| -rw-r--r-- | third_party/libxml/google.patch | 2 | ||||
| -rw-r--r-- | third_party/libxml/win32/Makefile | 2 | ||||
| -rw-r--r-- | third_party/libxml/win32/Makefile.msvc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/third_party/libxml/google.patch b/third_party/libxml/google.patch index 25ca7d0..3f4a9f8 100644 --- a/third_party/libxml/google.patch +++ b/third_party/libxml/google.patch @@ -494,7 +494,7 @@ Index: win32/Makefile.msvc LIBS = $(LIBS) iconv.lib !endif ++!if "$(WITH_ICU)" == "1" -++LIBS = $(LIBS) icuuc.lib +++LIBS = $(LIBS) icu.lib ++!endif !if "$(WITH_ZLIB)" == "1" LIBS = $(LIBS) zdll.lib diff --git a/third_party/libxml/win32/Makefile b/third_party/libxml/win32/Makefile index 49b3f86..e7947cc 100644 --- a/third_party/libxml/win32/Makefile +++ b/third_party/libxml/win32/Makefile @@ -72,7 +72,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib LIBS = $(LIBS) iconv.lib !endif +!if "$(WITH_ICU)" == "1" -+LIBS = $(LIBS) icuuc.lib ++LIBS = $(LIBS) icu.lib +!endif !if "$(WITH_ZLIB)" == "1" LIBS = $(LIBS) zdll.lib diff --git a/third_party/libxml/win32/Makefile.msvc b/third_party/libxml/win32/Makefile.msvc index 49b3f86..e7947cc 100644 --- a/third_party/libxml/win32/Makefile.msvc +++ b/third_party/libxml/win32/Makefile.msvc @@ -72,7 +72,7 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib LIBS = $(LIBS) iconv.lib !endif +!if "$(WITH_ICU)" == "1" -+LIBS = $(LIBS) icuuc.lib ++LIBS = $(LIBS) icu.lib +!endif !if "$(WITH_ZLIB)" == "1" LIBS = $(LIBS) zdll.lib |