diff options
author | Karl Berry <karl@freefriends.org> | 2022-01-16 23:21:19 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-01-16 23:21:19 +0000 |
commit | e5a4f2edfd4df595b47990d5228aba0c4dc038bd (patch) | |
tree | 80259a729122ee1f04a33a2f960c6b993156a528 /Build/source/libs/icu/icu-src/source/allinone | |
parent | 5176866c6a12a2d1d36fe4fd7892573dd0de81c6 (diff) |
icu 70.1
git-svn-id: svn://tug.org/texlive/trunk@61625 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/icu/icu-src/source/allinone')
3 files changed, 30 insertions, 1 deletions
diff --git a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props index a00e2c43047..603788a9537 100644 --- a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props +++ b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props @@ -14,7 +14,7 @@ C4661 No suitable definition provided for explicit template instantiation request. C4715 Not all control paths return a value. C4706 Assignment within conditional expression. - C4005 Macro redifintion. + C4005 Macro redefinition. C4068 Unknown pragma. C4267 Conversion from size_t to type, possible loss of data. C4910 __declspec(dllexport) and extern are incompatible on an explicit instantiation. diff --git a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props index adee8f67191..5549a2b813a 100644 --- a/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props +++ b/Build/source/libs/icu/icu-src/source/allinone/Build.Windows.PlatformToolset.props @@ -56,4 +56,11 @@ <!-- For example: MSBuild complains that the common project creates "icuuc62.dll" rather than "common.dll". However, this is intentional. --> <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages> </PropertyGroup> + + <!-- This enables outputting the source code line when an error occurs (to make it easier to see what/where the issue is). --> + <ItemDefinitionGroup> + <ClCompile> + <DiagnosticsFormat>Caret</DiagnosticsFormat> + </ClCompile> + </ItemDefinitionGroup> </Project> diff --git a/Build/source/libs/icu/icu-src/source/allinone/allinone.sln b/Build/source/libs/icu/icu-src/source/allinone/allinone.sln index fbbec359e48..48de0977128 100644 --- a/Build/source/libs/icu/icu-src/source/allinone/allinone.sln +++ b/Build/source/libs/icu/icu-src/source/allinone/allinone.sln @@ -106,6 +106,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkgdata", "..\tools\pkgdata {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icuexportdata", "..\tools\icuexportdata\icuexportdata.vcxproj", "{C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}" + ProjectSection(ProjectDependencies) = postProject + {6B231032-3CB5-4EED-9210-810D666A23A0} = {6B231032-3CB5-4EED-9210-810D666A23A0} + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stubdata", "..\stubdata\stubdata.vcxproj", "{203EC78A-0531-43F0-A636-285439BDE025}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolutil", "..\tools\toolutil\toolutil.vcxproj", "{6B231032-3CB5-4EED-9210-810D666A23A0}" @@ -470,6 +476,22 @@ Global {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.Build.0 = Release|Win32 {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|x64.ActiveCfg = Release|x64 {4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|x64.Build.0 = Release|x64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|ARM.ActiveCfg = Debug|ARM + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|ARM.Build.0 = Debug|ARM + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|ARM64.Build.0 = Debug|ARM64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|Win32.ActiveCfg = Debug|Win32 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|Win32.Build.0 = Debug|Win32 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|x64.ActiveCfg = Debug|x64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Debug|x64.Build.0 = Debug|x64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|ARM.ActiveCfg = Release|ARM + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|ARM.Build.0 = Release|ARM + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|ARM64.ActiveCfg = Release|ARM64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|ARM64.Build.0 = Release|ARM64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|Win32.ActiveCfg = Release|Win32 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|Win32.Build.0 = Release|Win32 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|x64.ActiveCfg = Release|x64 + {C5185F6D-BC0A-4DF7-A63C-B107D1C9C82F}.Release|x64.Build.0 = Release|x64 {203EC78A-0531-43F0-A636-285439BDE025}.Debug|ARM.ActiveCfg = Debug|ARM {203EC78A-0531-43F0-A636-285439BDE025}.Debug|ARM.Build.0 = Debug|ARM {203EC78A-0531-43F0-A636-285439BDE025}.Debug|ARM64.ActiveCfg = Debug|ARM64 |