From 3c7a6e30abe5050f29456ad7a8596dc5f61d91b9 Mon Sep 17 00:00:00 2001 From: Jeff Genovy <29107334+jefgen@users.noreply.github.com> Date: Tue, 20 Feb 2018 10:03:29 +0000 Subject: [PATCH] ICU-13171 Fix issues with ICU4C Samples, and various issues with vcxproj files. The samples now all build on Win32, except for the layout sample (but the LE is deprecated). X-SVN-Rev: 40951 --- .gitignore | 7 +++ icu4c/source/allinone/allinone.sln | 15 ++++- icu4c/source/samples/all/all.sln | 9 ++- icu4c/source/samples/break/break.sln | 8 +-- icu4c/source/samples/cal/cal.sln | 8 +-- icu4c/source/samples/cal/cal.vcxproj | 10 --- icu4c/source/samples/case/case.sln | 8 +-- icu4c/source/samples/citer/citer.vcxproj | 9 ++- icu4c/source/samples/coll/coll.sln | 8 +-- icu4c/source/samples/coll/coll.vcxproj | 2 +- icu4c/source/samples/date/date.sln | 8 +-- icu4c/source/samples/date/date.vcxproj | 32 +++------- icu4c/source/samples/datefmt/datefmt.sln | 8 +-- .../dtitvfmtsample/dtitvfmtsample.vcxproj | 40 ++++++------ .../samples/dtptngsample/dtptngsample.vcxproj | 30 +++------ icu4c/source/samples/legacy/legacy.sln | 8 +-- icu4c/source/samples/msgfmt/msgfmt.sln | 8 +-- icu4c/source/samples/numfmt/numfmt.sln | 8 +-- .../plurfmtsample/plurfmtsample.vcxproj | 41 ++++++------- icu4c/source/samples/props/props.sln | 8 +-- icu4c/source/samples/strsrch/strsrch.sln | 8 +-- icu4c/source/samples/translit/translit.sln | 8 +-- icu4c/source/samples/uciter8/uciter8.sln | 8 +-- icu4c/source/samples/ucnv/ucnv.sln | 8 +-- icu4c/source/samples/udata/reader.vcxproj | 33 +++++----- icu4c/source/samples/udata/udata.sln | 16 ++--- icu4c/source/samples/udata/writer.vcxproj | 37 ++++++----- icu4c/source/samples/ufortune/ufortune.sln | 8 +-- .../source/samples/ufortune/ufortune.vcxproj | 61 +++++++------------ icu4c/source/samples/ugrep/ugrep.cpp | 2 +- icu4c/source/samples/ugrep/ugrep.sln | 8 +-- icu4c/source/samples/uresb/uresb.sln | 16 ++--- icu4c/source/samples/ustring/ustring.sln | 8 +-- 33 files changed, 232 insertions(+), 264 deletions(-) diff --git a/.gitignore b/.gitignore index 95cc42712f9..21eae6c00c3 100644 --- a/.gitignore +++ b/.gitignore @@ -155,6 +155,7 @@ icu4c/source/samples/*.sdf icu4c/source/samples/Makefile icu4c/source/samples/all/*.opensdf icu4c/source/samples/all/*.sdf +icu4c/source/samples/all/.vs icu4c/source/samples/all/all.ncb icu4c/source/samples/all/all.suo icu4c/source/samples/break/*.vcxproj.user @@ -233,6 +234,10 @@ icu4c/source/samples/datefmt/datefmt.vcproj.*.*.user icu4c/source/samples/datefmt/release icu4c/source/samples/datefmt/x64 icu4c/source/samples/datefmt/x86 +icu4c/source/samples/dtitvfmtsample/x64 +icu4c/source/samples/dtitvfmtsample/x86 +icu4c/source/samples/dtptngsample/x64 +icu4c/source/samples/dtptngsample/x86 icu4c/source/samples/layout/*.d icu4c/source/samples/layout/*.pdb icu4c/source/samples/layout/*.vcxproj.user @@ -267,6 +272,8 @@ icu4c/source/samples/numfmt/numfmt.vcproj.*.*.user icu4c/source/samples/numfmt/release icu4c/source/samples/numfmt/x64 icu4c/source/samples/numfmt/x86 +icu4c/source/samples/plurfmtsample/x64 +icu4c/source/samples/plurfmtsample/x86 icu4c/source/samples/props/*.vcxproj.user icu4c/source/samples/props/Debug icu4c/source/samples/props/props diff --git a/icu4c/source/allinone/allinone.sln b/icu4c/source/allinone/allinone.sln index 88a0d19744f..0cfb6080102 100644 --- a/icu4c/source/allinone/allinone.sln +++ b/icu4c/source/allinone/allinone.sln @@ -1,8 +1,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2026 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cal", "..\samples\cal\cal.vcxproj", "{F7659D77-09CF-4FE9-ACEE-927287AA9509}" + ProjectSection(ProjectDependencies) = postProject + {0178B127-6269-407D-B112-93877BB62776} = {0178B127-6269-407D-B112-93877BB62776} + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cintltst", "..\test\cintltst\cintltst.vcxproj", "{3D1246AE-1B32-479B-BECA-AEFA97BE2321}" EndProject @@ -11,6 +15,10 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ctestfw", "..\tools\ctestfw\ctestfw.vcxproj", "{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "date", "..\samples\date\date.vcxproj", "{38B5751A-C6F9-4409-950C-F4F9DA17275F}" + ProjectSection(ProjectDependencies) = postProject + {0178B127-6269-407D-B112-93877BB62776} = {0178B127-6269-407D-B112-93877BB62776} + {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} = {73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "derb", "..\tools\genrb\derb.vcxproj", "{D3065ADB-8820-4CC7-9B6C-9510833961A3}" ProjectSection(ProjectDependencies) = postProject @@ -409,6 +417,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {A714726C-FE2D-466C-95F3-06C5C4EAE54F} + EndGlobalSection GlobalSection(SubversionScc) = preSolution Svn-Managed = True Manager = AnkhSVN - Subversion Support for Visual Studio diff --git a/icu4c/source/samples/all/all.sln b/icu4c/source/samples/all/all.sln index a2772461605..503243ebf52 100644 --- a/icu4c/source/samples/all/all.sln +++ b/icu4c/source/samples/all/all.sln @@ -258,21 +258,24 @@ Global {683745AD-3BC2-4B89-898B-93490D7F2757}.Release|x64.Build.0 = Release|x64 {8945255B-473B-4C47-9425-E92384338CAA}.Debug|Win32.ActiveCfg = Debug|Win32 {8945255B-473B-4C47-9425-E92384338CAA}.Debug|Win32.Build.0 = Debug|Win32 - {8945255B-473B-4C47-9425-E92384338CAA}.Debug|x64.ActiveCfg = Debug|Win32 + {8945255B-473B-4C47-9425-E92384338CAA}.Debug|x64.ActiveCfg = Debug|x64 + {8945255B-473B-4C47-9425-E92384338CAA}.Debug|x64.Build.0 = Debug|x64 {8945255B-473B-4C47-9425-E92384338CAA}.Release|Win32.ActiveCfg = Release|Win32 {8945255B-473B-4C47-9425-E92384338CAA}.Release|Win32.Build.0 = Release|Win32 {8945255B-473B-4C47-9425-E92384338CAA}.Release|x64.ActiveCfg = Release|x64 {8945255B-473B-4C47-9425-E92384338CAA}.Release|x64.Build.0 = Release|x64 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|Win32.ActiveCfg = Debug|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|Win32.Build.0 = Debug|Win32 - {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|x64.ActiveCfg = Debug|Win32 + {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|x64.ActiveCfg = Debug|x64 + {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|x64.Build.0 = Debug|x64 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|Win32.ActiveCfg = Release|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|Win32.Build.0 = Release|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|x64.ActiveCfg = Release|x64 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|x64.Build.0 = Release|x64 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|Win32.ActiveCfg = Debug|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|Win32.Build.0 = Debug|Win32 - {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|x64.ActiveCfg = Debug|Win32 + {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|x64.ActiveCfg = Debug|x64 + {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|x64.Build.0 = Debug|x64 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|Win32.ActiveCfg = Release|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|Win32.Build.0 = Release|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|x64.ActiveCfg = Release|x64 diff --git a/icu4c/source/samples/break/break.sln b/icu4c/source/samples/break/break.sln index 131bb0428f9..80cca424523 100644 --- a/icu4c/source/samples/break/break.sln +++ b/icu4c/source/samples/break/break.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {DEEADF02-9C14-4854-A395-E505D2904D65}.Debug|Win32.ActiveCfg = Debug|Win32 {DEEADF02-9C14-4854-A395-E505D2904D65}.Debug|Win32.Build.0 = Debug|Win32 - {DEEADF02-9C14-4854-A395-E505D2904D65}.Debug|x64.ActiveCfg = Debug|Win32 - {DEEADF02-9C14-4854-A395-E505D2904D65}.Debug|x64.Build.0 = Debug|Win32 + {DEEADF02-9C14-4854-A395-E505D2904D65}.Debug|x64.ActiveCfg = Debug|x64 + {DEEADF02-9C14-4854-A395-E505D2904D65}.Debug|x64.Build.0 = Debug|x64 {DEEADF02-9C14-4854-A395-E505D2904D65}.Release|Win32.ActiveCfg = Release|Win32 {DEEADF02-9C14-4854-A395-E505D2904D65}.Release|Win32.Build.0 = Release|Win32 - {DEEADF02-9C14-4854-A395-E505D2904D65}.Release|x64.ActiveCfg = Release|Win32 - {DEEADF02-9C14-4854-A395-E505D2904D65}.Release|x64.Build.0 = Release|Win32 + {DEEADF02-9C14-4854-A395-E505D2904D65}.Release|x64.ActiveCfg = Release|x64 + {DEEADF02-9C14-4854-A395-E505D2904D65}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/cal/cal.sln b/icu4c/source/samples/cal/cal.sln index 1cee7dac485..19f41e9f039 100644 --- a/icu4c/source/samples/cal/cal.sln +++ b/icu4c/source/samples/cal/cal.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Debug|Win32.ActiveCfg = Debug|Win32 {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Debug|Win32.Build.0 = Debug|Win32 - {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Debug|x64.ActiveCfg = Debug|Win32 - {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Debug|x64.Build.0 = Debug|Win32 + {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Debug|x64.ActiveCfg = Debug|x64 + {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Debug|x64.Build.0 = Debug|x64 {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|Win32.ActiveCfg = Release|Win32 {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|Win32.Build.0 = Release|Win32 - {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|x64.ActiveCfg = Release|Win32 - {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|x64.Build.0 = Release|Win32 + {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|x64.ActiveCfg = Release|x64 + {F7659D77-09CF-4FE9-ACEE-927287AA9509}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/cal/cal.vcxproj b/icu4c/source/samples/cal/cal.vcxproj index f9fce08d392..c61da73ab47 100644 --- a/icu4c/source/samples/cal/cal.vcxproj +++ b/icu4c/source/samples/cal/cal.vcxproj @@ -261,16 +261,6 @@ - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - false - - - {0178b127-6269-407d-b112-93877bb62776} - false - - diff --git a/icu4c/source/samples/case/case.sln b/icu4c/source/samples/case/case.sln index e834d4d3386..46622a279a8 100644 --- a/icu4c/source/samples/case/case.sln +++ b/icu4c/source/samples/case/case.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Debug|Win32.ActiveCfg = Debug|Win32 {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Debug|Win32.Build.0 = Debug|Win32 - {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Debug|x64.ActiveCfg = Debug|Win32 - {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Debug|x64.Build.0 = Debug|Win32 + {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Debug|x64.ActiveCfg = Debug|x64 + {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Debug|x64.Build.0 = Debug|x64 {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Release|Win32.ActiveCfg = Release|Win32 {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Release|Win32.Build.0 = Release|Win32 - {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Release|x64.ActiveCfg = Release|Win32 - {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Release|x64.Build.0 = Release|Win32 + {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Release|x64.ActiveCfg = Release|x64 + {2316BE8C-189D-4C8B-B506-9D9EE25AC46D}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/citer/citer.vcxproj b/icu4c/source/samples/citer/citer.vcxproj index 6e9a8396bbc..27a4888c806 100644 --- a/icu4c/source/samples/citer/citer.vcxproj +++ b/icu4c/source/samples/citer/citer.vcxproj @@ -20,7 +20,6 @@ {247E2681-6C84-408B-B40C-5DB50BC5E18F} - Win32Proj 8.1 @@ -95,7 +94,7 @@ icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) - ./Debug/citer.exe + .\x86\Debug\citer.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true $(OutDir)citer.pdb @@ -125,7 +124,7 @@ icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) - ./Debug/citer.exe + .\x64\Debug\citer.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true $(OutDir)citer.pdb @@ -149,7 +148,7 @@ icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) - ./Release/citer.exe + .\x86\Release\citer.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true Console @@ -177,7 +176,7 @@ icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) - ./Release/citer.exe + .\x64\Release\citer.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true Console diff --git a/icu4c/source/samples/coll/coll.sln b/icu4c/source/samples/coll/coll.sln index 3f6757af40d..5a4acc8d9f6 100644 --- a/icu4c/source/samples/coll/coll.sln +++ b/icu4c/source/samples/coll/coll.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Debug|Win32.ActiveCfg = Debug|Win32 {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Debug|Win32.Build.0 = Debug|Win32 - {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Debug|x64.ActiveCfg = Debug|Win32 - {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Debug|x64.Build.0 = Debug|Win32 + {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Debug|x64.ActiveCfg = Debug|x64 + {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Debug|x64.Build.0 = Debug|x64 {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Release|Win32.ActiveCfg = Release|Win32 {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Release|Win32.Build.0 = Release|Win32 - {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Release|x64.ActiveCfg = Release|Win32 - {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Release|x64.Build.0 = Release|Win32 + {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Release|x64.ActiveCfg = Release|x64 + {7664D0D2-0263-4BFB-AE19-9A1CAD231440}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/coll/coll.vcxproj b/icu4c/source/samples/coll/coll.vcxproj index 5c586e42e09..72cc55fc334 100644 --- a/icu4c/source/samples/coll/coll.vcxproj +++ b/icu4c/source/samples/coll/coll.vcxproj @@ -109,7 +109,7 @@ 0x0409 - icuind.lib;icuucd.lib;%(AdditionalDependencies) + icuin.lib;icuuc.lib;%(AdditionalDependencies) .\x86\Release/coll.exe true ..\..\..\lib;%(AdditionalLibraryDirectories) diff --git a/icu4c/source/samples/date/date.sln b/icu4c/source/samples/date/date.sln index 63749a27875..0ec4cd58413 100644 --- a/icu4c/source/samples/date/date.sln +++ b/icu4c/source/samples/date/date.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Debug|Win32.ActiveCfg = Debug|Win32 {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Debug|Win32.Build.0 = Debug|Win32 - {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Debug|x64.ActiveCfg = Debug|Win32 - {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Debug|x64.Build.0 = Debug|Win32 + {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Debug|x64.ActiveCfg = Debug|x64 + {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Debug|x64.Build.0 = Debug|x64 {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|Win32.ActiveCfg = Release|Win32 {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|Win32.Build.0 = Release|Win32 - {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|x64.ActiveCfg = Release|Win32 - {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|x64.Build.0 = Release|Win32 + {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|x64.ActiveCfg = Release|x64 + {38B5751A-C6F9-4409-950C-F4F9DA17275F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/date/date.vcxproj b/icu4c/source/samples/date/date.vcxproj index 4baab9c3ee4..35232e280c4 100644 --- a/icu4c/source/samples/date/date.vcxproj +++ b/icu4c/source/samples/date/date.vcxproj @@ -94,9 +94,7 @@ MultiThreadedDLL true true - - - .\x86\Release/date.pch + NotUsing .\x86\Release/ .\x86\Release/ .\x86\Release/ @@ -105,6 +103,7 @@ Default /utf-8 %(AdditionalOptions) true + NDEBUG;%(PreprocessorDefinitions) @@ -135,9 +134,7 @@ MultiThreadedDLL true true - - - .\x64\Release/date.pch + NotUsing .\x64\Release/ .\x64\Release/ .\x64\Release/ @@ -146,6 +143,7 @@ Default /utf-8 %(AdditionalOptions) true + NDEBUG;%(PreprocessorDefinitions) @@ -155,7 +153,7 @@ icuuc.lib;icuin.lib;%(AdditionalDependencies) .\x64\Release/date.exe true - ../../../lib64;%(AdditionalLibraryDirectories) + ..\..\..\lib64;%(AdditionalLibraryDirectories) .\x64\Release/date.pdb Console false @@ -175,9 +173,7 @@ EnableFastChecks MultiThreadedDebugDLL true - - - .\x86\Debug/date.pch + NotUsing .\x86\Debug/ .\x86\Debug/ .\x86\Debug/ @@ -187,6 +183,7 @@ Default /utf-8 %(AdditionalOptions) true + _DEBUG;%(PreprocessorDefinitions) @@ -217,9 +214,7 @@ EnableFastChecks MultiThreadedDebugDLL true - - - .\x64\Debug/date.pch + NotUsing .\x64\Debug/ .\x64\Debug/ .\x64\Debug/ @@ -229,6 +224,7 @@ Default /utf-8 %(AdditionalOptions) true + _DEBUG;%(PreprocessorDefinitions) @@ -255,16 +251,6 @@ - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - false - - - {0178b127-6269-407d-b112-93877bb62776} - false - - diff --git a/icu4c/source/samples/datefmt/datefmt.sln b/icu4c/source/samples/datefmt/datefmt.sln index a82993df8d6..346439ad1a0 100644 --- a/icu4c/source/samples/datefmt/datefmt.sln +++ b/icu4c/source/samples/datefmt/datefmt.sln @@ -14,12 +14,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Debug|Win32.ActiveCfg = Debug|Win32 {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Debug|Win32.Build.0 = Debug|Win32 - {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Debug|x64.ActiveCfg = Debug|Win32 - {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Debug|x64.Build.0 = Debug|Win32 + {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Debug|x64.ActiveCfg = Debug|x64 + {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Debug|x64.Build.0 = Debug|x64 {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Release|Win32.ActiveCfg = Release|Win32 {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Release|Win32.Build.0 = Release|Win32 - {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Release|x64.ActiveCfg = Release|Win32 - {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Release|x64.Build.0 = Release|Win32 + {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Release|x64.ActiveCfg = Release|x64 + {6D592DB7-B9C8-4B1B-A1C1-F9A9EB4FD4E4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj index e7f92d15ea0..33d80ee2566 100644 --- a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj +++ b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj @@ -20,7 +20,7 @@ {8945255B-473B-4C47-9425-E92384338CAA} - dtitvfmtsample + samples 8.1 @@ -67,15 +67,24 @@ - .\x86\debug\ + .\x86\Debug\ + .\x86\Debug\ + $(ProjectName) - - - .\x86\debug\ + + .\x64\Debug\ + .\x64\Debug\ + $(ProjectName) - .\x86\release - .\x86\release + .\x86\Release\ + .\x86\Release\ + $(ProjectName) + + + .\x64\Release\ + .\x64\Release\ + $(ProjectName) @@ -127,6 +136,7 @@ true true true + icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) ..\..\..\lib;%(AdditionalLibraryDirectories) @@ -151,21 +161,7 @@ - - ../../common;%(AdditionalIncludeDirectories) - ../../common;%(AdditionalIncludeDirectories) - - - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - - - {0178b127-6269-407d-b112-93877bb62776} - - - {c2b04507-2521-4801-bf0d-5fd79d6d518c} - + diff --git a/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj b/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj index 91735a31cdc..85a413a2418 100644 --- a/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj +++ b/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj @@ -21,7 +21,6 @@ {115886F0-7DFB-4B8B-BE79-83162EE8713B} samples - dtptngsample 8.1 @@ -68,25 +67,23 @@ - .\x86\debug\ - - - .\x86\debug\ + .\x86\Debug\ + .\x86\Debug\ $(ProjectName) + .\x64\Debug\ + .\x64\Debug\ $(ProjectName) - .\x86\release - - - .\x86\release - - + .\x86\Release\ + .\x86\Release\ $(ProjectName) + .\x64\Release\ + .\x64\Release\ $(ProjectName) @@ -160,17 +157,6 @@ - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - - - {0178b127-6269-407d-b112-93877bb62776} - - - {c2b04507-2521-4801-bf0d-5fd79d6d518c} - - diff --git a/icu4c/source/samples/legacy/legacy.sln b/icu4c/source/samples/legacy/legacy.sln index f74cf1167d8..b2b176fb29f 100644 --- a/icu4c/source/samples/legacy/legacy.sln +++ b/icu4c/source/samples/legacy/legacy.sln @@ -14,12 +14,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {57F56795-1802-4605-88A0-013AAE9998F6}.Debug|Win32.ActiveCfg = Debug|Win32 {57F56795-1802-4605-88A0-013AAE9998F6}.Debug|Win32.Build.0 = Debug|Win32 - {57F56795-1802-4605-88A0-013AAE9998F6}.Debug|x64.ActiveCfg = Debug|Win32 - {57F56795-1802-4605-88A0-013AAE9998F6}.Debug|x64.Build.0 = Debug|Win32 + {57F56795-1802-4605-88A0-013AAE9998F6}.Debug|x64.ActiveCfg = Debug|x64 + {57F56795-1802-4605-88A0-013AAE9998F6}.Debug|x64.Build.0 = Debug|x64 {57F56795-1802-4605-88A0-013AAE9998F6}.Release|Win32.ActiveCfg = Release|Win32 {57F56795-1802-4605-88A0-013AAE9998F6}.Release|Win32.Build.0 = Release|Win32 - {57F56795-1802-4605-88A0-013AAE9998F6}.Release|x64.ActiveCfg = Release|Win32 - {57F56795-1802-4605-88A0-013AAE9998F6}.Release|x64.Build.0 = Release|Win32 + {57F56795-1802-4605-88A0-013AAE9998F6}.Release|x64.ActiveCfg = Release|x64 + {57F56795-1802-4605-88A0-013AAE9998F6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/msgfmt/msgfmt.sln b/icu4c/source/samples/msgfmt/msgfmt.sln index b1636318b42..f90def09d81 100644 --- a/icu4c/source/samples/msgfmt/msgfmt.sln +++ b/icu4c/source/samples/msgfmt/msgfmt.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Debug|Win32.ActiveCfg = Debug|Win32 {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Debug|Win32.Build.0 = Debug|Win32 - {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Debug|x64.ActiveCfg = Debug|Win32 - {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Debug|x64.Build.0 = Debug|Win32 + {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Debug|x64.ActiveCfg = Debug|x64 + {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Debug|x64.Build.0 = Debug|x64 {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Release|Win32.ActiveCfg = Release|Win32 {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Release|Win32.Build.0 = Release|Win32 - {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Release|x64.ActiveCfg = Release|Win32 - {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Release|x64.Build.0 = Release|Win32 + {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Release|x64.ActiveCfg = Release|x64 + {5FF1D1A2-1630-446C-B6EA-93EFD4F975C3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/numfmt/numfmt.sln b/icu4c/source/samples/numfmt/numfmt.sln index d85573146f6..f691efd2409 100644 --- a/icu4c/source/samples/numfmt/numfmt.sln +++ b/icu4c/source/samples/numfmt/numfmt.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {721FBD47-E458-4C35-90DA-FF192907D5E2}.Debug|Win32.ActiveCfg = Debug|Win32 {721FBD47-E458-4C35-90DA-FF192907D5E2}.Debug|Win32.Build.0 = Debug|Win32 - {721FBD47-E458-4C35-90DA-FF192907D5E2}.Debug|x64.ActiveCfg = Debug|Win32 - {721FBD47-E458-4C35-90DA-FF192907D5E2}.Debug|x64.Build.0 = Debug|Win32 + {721FBD47-E458-4C35-90DA-FF192907D5E2}.Debug|x64.ActiveCfg = Debug|x64 + {721FBD47-E458-4C35-90DA-FF192907D5E2}.Debug|x64.Build.0 = Debug|x64 {721FBD47-E458-4C35-90DA-FF192907D5E2}.Release|Win32.ActiveCfg = Release|Win32 {721FBD47-E458-4C35-90DA-FF192907D5E2}.Release|Win32.Build.0 = Release|Win32 - {721FBD47-E458-4C35-90DA-FF192907D5E2}.Release|x64.ActiveCfg = Release|Win32 - {721FBD47-E458-4C35-90DA-FF192907D5E2}.Release|x64.Build.0 = Release|Win32 + {721FBD47-E458-4C35-90DA-FF192907D5E2}.Release|x64.ActiveCfg = Release|x64 + {721FBD47-E458-4C35-90DA-FF192907D5E2}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj b/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj index 158617b5e07..de4fc069fe9 100644 --- a/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj +++ b/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj @@ -20,7 +20,6 @@ {B500B731-ED1A-4761-94ED-B22DFE25FF2B} - plurfmtsample 8.1 @@ -67,17 +66,24 @@ - .\x86\debug + .\x86\Debug\ + .\x86\Debug\ + $(ProjectName) - - - .\x86\debug + + .\x64\Debug\ + .\x64\Debug\ + $(ProjectName) - .\x86\release + .\x86\Release\ + .\x86\Release\ + $(ProjectName) - - .\x86\release + + .\x64\Release\ + .\x64\Release\ + $(ProjectName) @@ -88,7 +94,7 @@ true - .\x86\debug/plurfmtsample.exe + .\x86\Debug\plurfmtsample.exe ..\..\..\lib;%(AdditionalLibraryDirectories) icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) @@ -102,7 +108,7 @@ true - .\x64\debug/plurfmtsample.exe + .\x64\Debug\plurfmtsample.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) @@ -120,7 +126,7 @@ true true true - .\x86\debug/plurfmtsample.exe + .\x86\Release\plurfmtsample.exe ..\..\..\lib;%(AdditionalLibraryDirectories) icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) @@ -138,7 +144,7 @@ true true true - .\x64\Release/plurfmtsample.exe + .\x64\Release\plurfmtsample.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) @@ -146,17 +152,6 @@ - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - - - {0178b127-6269-407d-b112-93877bb62776} - - - {c2b04507-2521-4801-bf0d-5fd79d6d518c} - - diff --git a/icu4c/source/samples/props/props.sln b/icu4c/source/samples/props/props.sln index 065009cb0f6..7027a11d32e 100644 --- a/icu4c/source/samples/props/props.sln +++ b/icu4c/source/samples/props/props.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Debug|Win32.ActiveCfg = Debug|Win32 {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Debug|Win32.Build.0 = Debug|Win32 - {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Debug|x64.ActiveCfg = Debug|Win32 - {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Debug|x64.Build.0 = Debug|Win32 + {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Debug|x64.ActiveCfg = Debug|x64 + {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Debug|x64.Build.0 = Debug|x64 {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Release|Win32.ActiveCfg = Release|Win32 {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Release|Win32.Build.0 = Release|Win32 - {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Release|x64.ActiveCfg = Release|Win32 - {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Release|x64.Build.0 = Release|Win32 + {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Release|x64.ActiveCfg = Release|x64 + {ABE4CD17-8ED8-4DE6-ABDE-CDEFC220CF60}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/strsrch/strsrch.sln b/icu4c/source/samples/strsrch/strsrch.sln index efd7d656b63..399eb2fe91e 100644 --- a/icu4c/source/samples/strsrch/strsrch.sln +++ b/icu4c/source/samples/strsrch/strsrch.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Debug|Win32.ActiveCfg = Debug|Win32 {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Debug|Win32.Build.0 = Debug|Win32 - {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Debug|x64.ActiveCfg = Debug|Win32 - {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Debug|x64.Build.0 = Debug|Win32 + {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Debug|x64.ActiveCfg = Debug|x64 + {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Debug|x64.Build.0 = Debug|x64 {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Release|Win32.ActiveCfg = Release|Win32 {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Release|Win32.Build.0 = Release|Win32 - {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Release|x64.ActiveCfg = Release|Win32 - {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Release|x64.Build.0 = Release|Win32 + {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Release|x64.ActiveCfg = Release|x64 + {E97790D1-7ABE-4C8E-9627-251ABEAA3EEC}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/translit/translit.sln b/icu4c/source/samples/translit/translit.sln index 6b74f1b5fce..382e4c65ca7 100644 --- a/icu4c/source/samples/translit/translit.sln +++ b/icu4c/source/samples/translit/translit.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Debug|Win32.ActiveCfg = Debug|Win32 {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Debug|Win32.Build.0 = Debug|Win32 - {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Debug|x64.ActiveCfg = Debug|Win32 - {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Debug|x64.Build.0 = Debug|Win32 + {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Debug|x64.ActiveCfg = Debug|x64 + {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Debug|x64.Build.0 = Debug|x64 {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Release|Win32.ActiveCfg = Release|Win32 {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Release|Win32.Build.0 = Release|Win32 - {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Release|x64.ActiveCfg = Release|Win32 - {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Release|x64.Build.0 = Release|Win32 + {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Release|x64.ActiveCfg = Release|x64 + {D1BEC124-303A-4F44-BA70-55769B8FE96A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/uciter8/uciter8.sln b/icu4c/source/samples/uciter8/uciter8.sln index 6ad99e5fbf3..8fe98ffb349 100644 --- a/icu4c/source/samples/uciter8/uciter8.sln +++ b/icu4c/source/samples/uciter8/uciter8.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Debug|Win32.ActiveCfg = Debug|Win32 {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Debug|Win32.Build.0 = Debug|Win32 - {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Debug|x64.ActiveCfg = Debug|Win32 - {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Debug|x64.Build.0 = Debug|Win32 + {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Debug|x64.ActiveCfg = Debug|x64 + {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Debug|x64.Build.0 = Debug|x64 {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Release|Win32.ActiveCfg = Release|Win32 {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Release|Win32.Build.0 = Release|Win32 - {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Release|x64.ActiveCfg = Release|Win32 - {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Release|x64.Build.0 = Release|Win32 + {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Release|x64.ActiveCfg = Release|x64 + {94379DD9-E6CC-47AC-8E62-0A4ABD8EB121}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/ucnv/ucnv.sln b/icu4c/source/samples/ucnv/ucnv.sln index 0ae26ffc30c..40673e3b8f6 100644 --- a/icu4c/source/samples/ucnv/ucnv.sln +++ b/icu4c/source/samples/ucnv/ucnv.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Debug|Win32.ActiveCfg = Debug|Win32 {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Debug|Win32.Build.0 = Debug|Win32 - {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Debug|x64.ActiveCfg = Debug|Win32 - {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Debug|x64.Build.0 = Debug|Win32 + {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Debug|x64.ActiveCfg = Debug|x64 + {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Debug|x64.Build.0 = Debug|x64 {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Release|Win32.ActiveCfg = Release|Win32 {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Release|Win32.Build.0 = Release|Win32 - {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Release|x64.ActiveCfg = Release|Win32 - {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Release|x64.Build.0 = Release|Win32 + {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Release|x64.ActiveCfg = Release|x64 + {8C95060E-61F5-464E-BB42-95B788C0D7E4}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/udata/reader.vcxproj b/icu4c/source/samples/udata/reader.vcxproj index 180431d2fb6..df32d11ac50 100644 --- a/icu4c/source/samples/udata/reader.vcxproj +++ b/icu4c/source/samples/udata/reader.vcxproj @@ -67,20 +67,25 @@ - - <_ProjectFileVersion>10.0.30319.1 - .\reader_Win32_Debug\ - .\reader_Win32_Debug\ - true - .\x64\Debug\ - .\x64\Debug\ - true - .\reader_Win32_Release\ - .\reader_Win32_Release\ - false - .\x64\Release\ - .\x64\Release\ - false + + .\x86\Debug\ + .\x86\Debug\ + $(ProjectName) + + + .\x64\Debug\ + .\x64\Debug\ + $(ProjectName) + + + .\x86\Release\ + .\x86\Release\ + $(ProjectName) + + + .\x64\Release\ + .\x64\Release\ + $(ProjectName) diff --git a/icu4c/source/samples/udata/udata.sln b/icu4c/source/samples/udata/udata.sln index a3b2fd343ba..8a3747df4ab 100644 --- a/icu4c/source/samples/udata/udata.sln +++ b/icu4c/source/samples/udata/udata.sln @@ -14,20 +14,20 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Debug|Win32.ActiveCfg = Debug|Win32 {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Debug|Win32.Build.0 = Debug|Win32 - {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Debug|x64.ActiveCfg = Debug|Win32 - {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Debug|x64.Build.0 = Debug|Win32 + {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Debug|x64.ActiveCfg = Debug|x64 + {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Debug|x64.Build.0 = Debug|x64 {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Release|Win32.ActiveCfg = Release|Win32 {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Release|Win32.Build.0 = Release|Win32 - {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Release|x64.ActiveCfg = Release|Win32 - {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Release|x64.Build.0 = Release|Win32 + {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Release|x64.ActiveCfg = Release|x64 + {BFEFC070-C5A9-42E3-BAAE-A51FB2C4BA28}.Release|x64.Build.0 = Release|x64 {40A90302-F173-4629-A003-F571D2D93D16}.Debug|Win32.ActiveCfg = Debug|Win32 {40A90302-F173-4629-A003-F571D2D93D16}.Debug|Win32.Build.0 = Debug|Win32 - {40A90302-F173-4629-A003-F571D2D93D16}.Debug|x64.ActiveCfg = Debug|Win32 - {40A90302-F173-4629-A003-F571D2D93D16}.Debug|x64.Build.0 = Debug|Win32 + {40A90302-F173-4629-A003-F571D2D93D16}.Debug|x64.ActiveCfg = Debug|x64 + {40A90302-F173-4629-A003-F571D2D93D16}.Debug|x64.Build.0 = Debug|x64 {40A90302-F173-4629-A003-F571D2D93D16}.Release|Win32.ActiveCfg = Release|Win32 {40A90302-F173-4629-A003-F571D2D93D16}.Release|Win32.Build.0 = Release|Win32 - {40A90302-F173-4629-A003-F571D2D93D16}.Release|x64.ActiveCfg = Release|Win32 - {40A90302-F173-4629-A003-F571D2D93D16}.Release|x64.Build.0 = Release|Win32 + {40A90302-F173-4629-A003-F571D2D93D16}.Release|x64.ActiveCfg = Release|x64 + {40A90302-F173-4629-A003-F571D2D93D16}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/udata/writer.vcxproj b/icu4c/source/samples/udata/writer.vcxproj index 5235e212244..bf3c1cf2f6d 100644 --- a/icu4c/source/samples/udata/writer.vcxproj +++ b/icu4c/source/samples/udata/writer.vcxproj @@ -67,20 +67,25 @@ - - <_ProjectFileVersion>10.0.30319.1 - .\x86\Debug\ - .\x86\Debug\ - true - .\x64\Debug\ - .\x64\Debug\ - true - .\x86\Release\ - .\x86\Release\ - false - .\x64\Release\ - .\x64\Release\ - false + + .\x86\Debug\ + .\x86\Debug\ + $(ProjectName) + + + .\x64\Debug\ + .\x64\Debug\ + $(ProjectName) + + + .\x86\Release\ + .\x86\Release\ + $(ProjectName) + + + .\x64\Release\ + .\x64\Release\ + $(ProjectName) @@ -229,10 +234,10 @@ icutu.lib;%(AdditionalDependencies) - .\x64\Release/writer.exe + .\x64\Release\writer.exe true ../../../lib64;%(AdditionalLibraryDirectories) - .\x64\Release/writer.pdb + .\x64\Release\writer.pdb Console false diff --git a/icu4c/source/samples/ufortune/ufortune.sln b/icu4c/source/samples/ufortune/ufortune.sln index 481189b05c3..c071818c4ca 100644 --- a/icu4c/source/samples/ufortune/ufortune.sln +++ b/icu4c/source/samples/ufortune/ufortune.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Debug|Win32.ActiveCfg = Debug|Win32 {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Debug|Win32.Build.0 = Debug|Win32 - {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Debug|x64.ActiveCfg = Debug|Win32 - {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Debug|x64.Build.0 = Debug|Win32 + {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Debug|x64.ActiveCfg = Debug|x64 + {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Debug|x64.Build.0 = Debug|x64 {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Release|Win32.ActiveCfg = Release|Win32 {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Release|Win32.Build.0 = Release|Win32 - {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Release|x64.ActiveCfg = Release|Win32 - {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Release|x64.Build.0 = Release|Win32 + {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Release|x64.ActiveCfg = Release|x64 + {25F534DF-93C9-4853-A88E-DB7D8CF74042}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/ufortune/ufortune.vcxproj b/icu4c/source/samples/ufortune/ufortune.vcxproj index 4dafd0e71ef..a8b4d8461b8 100644 --- a/icu4c/source/samples/ufortune/ufortune.vcxproj +++ b/icu4c/source/samples/ufortune/ufortune.vcxproj @@ -67,20 +67,25 @@ - - <_ProjectFileVersion>10.0.30319.1 - .\x86\Debug\ - .\x86\Debug\ - true - .\x64\Debug\ - .\x64\Debug\ - true - .\x86\Release\ - .\x86\Release\ - false - .\x64\Release\ - .\x64\Release\ - false + + .\x86\Debug\ + .\x86\Debug\ + $(ProjectName) + + + .\x64\Debug\ + .\x64\Debug\ + $(ProjectName) + + + .\x86\Release\ + .\x86\Release\ + $(ProjectName) + + + .\x64\Release\ + .\x64\Release\ + $(ProjectName) @@ -93,14 +98,11 @@ EnableFastChecks MultiThreadedDebugDLL true - .\x86\Debug/ufortune.pch - .\x86\Debug/ - .\x86\Debug/ - .\x86\Debug/ Level3 true EditAndContinue Default + _DEBUG;%(PreprocessorDefinitions) @@ -108,11 +110,9 @@ icuucd.lib;resources\fortune_resources.lib;icuiod.lib;%(AdditionalDependencies) - .\x86\Debug/ufortune.exe true ../../../lib;%(AdditionalLibraryDirectories) true - .\x86\Debug/ufortune.pdb Console false @@ -131,14 +131,11 @@ EnableFastChecks MultiThreadedDebugDLL true - .\x64\Debug/ufortune.pch - .\x64\Debug/ - .\x64\Debug/ - .\x64\Debug/ Level3 true ProgramDatabase Default + _DEBUG;%(PreprocessorDefinitions) @@ -146,11 +143,9 @@ icuucd.lib;resources\fortune_resources.lib;icuiod.lib;%(AdditionalDependencies) - .\x64\Debug/ufortune.exe true ../../../lib64;%(AdditionalLibraryDirectories) true - .\x64\Debug/ufortune.pdb Console false @@ -170,13 +165,10 @@ MultiThreadedDLL true true - .\x86\Release/ufortune.pch - .\x86\Release/ - .\x86\Release/ - .\x86\Release/ Level3 true Default + NDEBUG;%(PreprocessorDefinitions) @@ -184,10 +176,8 @@ icuuc.lib;resources\fortune_resources.lib;icuio.lib;%(AdditionalDependencies) - .\x86\Release/ufortune.exe true ../../../lib;%(AdditionalLibraryDirectories) - .\x86\Release/ufortune.pdb Console false @@ -207,13 +197,10 @@ MultiThreadedDLL true true - .\x64\Release/ufortune.pch - .\x64\Release/ - .\x64\Release/ - .\x64\Release/ Level3 true Default + NDEBUG;%(PreprocessorDefinitions) @@ -221,10 +208,8 @@ icuuc.lib;resources\fortune_resources.lib;icuio.lib;%(AdditionalDependencies) - .\x64\Release/ufortune.exe true ../../../lib64;%(AdditionalLibraryDirectories) - .\x64\Release/ufortune.pdb Console false diff --git a/icu4c/source/samples/ugrep/ugrep.cpp b/icu4c/source/samples/ugrep/ugrep.cpp index 4f19f214b4d..537741a7be2 100644 --- a/icu4c/source/samples/ugrep/ugrep.cpp +++ b/icu4c/source/samples/ugrep/ugrep.cpp @@ -291,7 +291,7 @@ void readFile(const char *name) { // Read in the file // charBuf = (char *)realloc(charBuf, rawFileLen+1); // Need error checking... - int t = fread(charBuf, 1, rawFileLen, file); + int t = static_cast(fread(charBuf, 1, rawFileLen, file)); if (t != rawFileLen) { fprintf(stderr, "Error reading file \"%s\"\n", fileName); fclose(file); diff --git a/icu4c/source/samples/ugrep/ugrep.sln b/icu4c/source/samples/ugrep/ugrep.sln index a5326987138..be16908ad14 100644 --- a/icu4c/source/samples/ugrep/ugrep.sln +++ b/icu4c/source/samples/ugrep/ugrep.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Debug|Win32.ActiveCfg = Debug|Win32 {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Debug|Win32.Build.0 = Debug|Win32 - {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Debug|x64.ActiveCfg = Debug|Win32 - {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Debug|x64.Build.0 = Debug|Win32 + {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Debug|x64.ActiveCfg = Debug|x64 + {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Debug|x64.Build.0 = Debug|x64 {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Release|Win32.ActiveCfg = Release|Win32 {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Release|Win32.Build.0 = Release|Win32 - {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Release|x64.ActiveCfg = Release|Win32 - {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Release|x64.Build.0 = Release|Win32 + {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Release|x64.ActiveCfg = Release|x64 + {63166CEB-02CC-472C-B3B7-E6C559939BDA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/uresb/uresb.sln b/icu4c/source/samples/uresb/uresb.sln index c17a5a64a15..8020fbb9fa0 100644 --- a/icu4c/source/samples/uresb/uresb.sln +++ b/icu4c/source/samples/uresb/uresb.sln @@ -17,20 +17,20 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Debug|Win32.ActiveCfg = Debug|Win32 {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Debug|Win32.Build.0 = Debug|Win32 - {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Debug|x64.ActiveCfg = Debug|Win32 - {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Debug|x64.Build.0 = Debug|Win32 + {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Debug|x64.ActiveCfg = Debug|x64 + {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Debug|x64.Build.0 = Debug|x64 {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Release|Win32.ActiveCfg = Release|Win32 {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Release|Win32.Build.0 = Release|Win32 - {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Release|x64.ActiveCfg = Release|Win32 - {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Release|x64.Build.0 = Release|Win32 + {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Release|x64.ActiveCfg = Release|x64 + {69437707-2FEF-4E2C-8C3F-6E6B3D241366}.Release|x64.Build.0 = Release|x64 {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Debug|Win32.ActiveCfg = Debug|Win32 {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Debug|Win32.Build.0 = Debug|Win32 - {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Debug|x64.ActiveCfg = Debug|Win32 - {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Debug|x64.Build.0 = Debug|Win32 + {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Debug|x64.ActiveCfg = Debug|x64 + {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Debug|x64.Build.0 = Debug|x64 {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Release|Win32.ActiveCfg = Release|Win32 {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Release|Win32.Build.0 = Release|Win32 - {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Release|x64.ActiveCfg = Release|Win32 - {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Release|x64.Build.0 = Release|Win32 + {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Release|x64.ActiveCfg = Release|x64 + {92580BF4-F4DA-4024-B3F8-444F982BC72F}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/icu4c/source/samples/ustring/ustring.sln b/icu4c/source/samples/ustring/ustring.sln index 265ca53eeb7..a096407112c 100644 --- a/icu4c/source/samples/ustring/ustring.sln +++ b/icu4c/source/samples/ustring/ustring.sln @@ -12,12 +12,12 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Debug|Win32.ActiveCfg = Debug|Win32 {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Debug|Win32.Build.0 = Debug|Win32 - {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Debug|x64.ActiveCfg = Debug|Win32 - {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Debug|x64.Build.0 = Debug|Win32 + {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Debug|x64.ActiveCfg = Debug|x64 + {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Debug|x64.Build.0 = Debug|x64 {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Release|Win32.ActiveCfg = Release|Win32 {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Release|Win32.Build.0 = Release|Win32 - {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Release|x64.ActiveCfg = Release|Win32 - {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Release|x64.Build.0 = Release|Win32 + {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Release|x64.ActiveCfg = Release|x64 + {FF92E6C1-BACA-41AD-BB6D-ECA19C05573E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE -- 2.50.1