summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--base/base.sln2
-rw-r--r--chrome/chrome.sln2
-rw-r--r--chrome/chrome_kjs.sln2
-rw-r--r--net/net.sln2
-rw-r--r--third_party/libxml/google.patch2
-rw-r--r--third_party/libxml/win32/Makefile2
-rw-r--r--third_party/libxml/win32/Makefile.msvc2
-rw-r--r--webkit/webkit.sln2
-rw-r--r--webkit/webkit_kjs.sln2
10 files changed, 10 insertions, 10 deletions
diff --git a/DEPS b/DEPS
index 464ec6e..0b5ec1e 100644
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@ deps = {
"/trunk/deps/third_party/cygwin@1788",
"src/third_party/icu38":
- "/trunk/deps/third_party/icu38@2280",
+ "/trunk/deps/third_party/icu38@2463",
"src/third_party/python_24":
"/trunk/deps/third_party/python_24@1790",
diff --git a/base/base.sln b/base/base.sln
index 94a02d3..f74e13e 100644
--- a/base/base.sln
+++ b/base/base.sln
@@ -21,7 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_message", "build\debu
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{F216062D-F9C4-4883-A52C-2BE9ECADEEA0}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\build\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
ProjectSection(ProjectDependencies) = postProject
{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
EndProjectSection
diff --git a/chrome/chrome.sln b/chrome/chrome.sln
index 80fc662..3d00275 100644
--- a/chrome/chrome.sln
+++ b/chrome/chrome.sln
@@ -75,7 +75,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit (ours)", "WebKit (ou
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automation\automation.vcproj", "{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\build\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
ProjectSection(ProjectDependencies) = postProject
{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
EndProjectSection
diff --git a/chrome/chrome_kjs.sln b/chrome/chrome_kjs.sln
index 30e6d04..8f4d42d 100644
--- a/chrome/chrome_kjs.sln
+++ b/chrome/chrome_kjs.sln
@@ -76,7 +76,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit (ours)", "WebKit (ou
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "automation", "test\automation\automation.vcproj", "{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\build\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
ProjectSection(ProjectDependencies) = postProject
{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
EndProjectSection
diff --git a/net/net.sln b/net/net.sln
index 11af6cb..9967691 100644
--- a/net/net.sln
+++ b/net/net.sln
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\base\build\base.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "debug_message", "..\base\build\debug_message.vcproj", "{0E5474AC-5996-4B13-87C0-4AE931EE0815}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\build\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
ProjectSection(ProjectDependencies) = postProject
{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
EndProjectSection
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
diff --git a/webkit/webkit.sln b/webkit/webkit.sln
index 877af38..9b1505f 100644
--- a/webkit/webkit.sln
+++ b/webkit/webkit.sln
@@ -67,7 +67,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\skia\skia.vcproj
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icudt", "..\third_party\icu38\build\icudt.vcproj", "{A0D94973-D355-47A5-A1E2-3456F321F010}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\build\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
ProjectSection(ProjectDependencies) = postProject
{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
EndProjectSection
diff --git a/webkit/webkit_kjs.sln b/webkit/webkit_kjs.sln
index 3cf1363..83ae4d2 100644
--- a/webkit/webkit_kjs.sln
+++ b/webkit/webkit_kjs.sln
@@ -59,7 +59,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\skia\skia.vcproj
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icudt", "..\third_party\icu38\build\icudt.vcproj", "{A0D94973-D355-47A5-A1E2-3456F321F010}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuuc", "..\third_party\icu38\build\icuuc.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icu", "..\third_party\icu38\build\icu.vcproj", "{8C27D792-2648-4F5E-9ED0-374276327308}"
ProjectSection(ProjectDependencies) = postProject
{A0D94973-D355-47A5-A1E2-3456F321F010} = {A0D94973-D355-47A5-A1E2-3456F321F010}
EndProjectSection
generated by cgit v1.1 at 2025-01-30 12:18:24 +0000