From f28895cccc2f429af0ed5ff5b86da69a8103840d Mon Sep 17 00:00:00 2001 From: Andy Heninger Date: Thu, 19 Jan 2017 18:12:50 +0000 Subject: [PATCH] ICU-12943 Windows Build Fixes for UChar=char16_t and utf-8 source files. X-SVN-Rev: 39581 --- .gitattributes | 2 - icu4c/source/common/common.vcxproj | 4 + icu4c/source/common/ustr_wcs.cpp | 4 +- icu4c/source/common/wintz.cpp | 6 +- icu4c/source/i18n/i18n.vcxproj | 4 + icu4c/source/io/io.vcxproj | 4 + icu4c/source/io/ufile.cpp | 10 +- icu4c/source/layoutex/layoutex.vcxproj | 4 + icu4c/source/runConfigureICU | 8 +- icu4c/source/test/cintltst/cintltst.vcxproj | 4 + icu4c/source/test/intltest/intltest.vcxproj | 14 +- icu4c/source/test/iotest/iotest.vcxproj | 534 ++++++++--------- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 572 ++++++++++--------- icu4c/source/tools/toolutil/toolutil.vcxproj | 4 + 14 files changed, 604 insertions(+), 570 deletions(-) diff --git a/.gitattributes b/.gitattributes index 9321c165fc9..f2b629ee974 100644 --- a/.gitattributes +++ b/.gitattributes @@ -99,7 +99,6 @@ icu4c/source/samples/uresb/resources.vcxproj -text icu4c/source/samples/uresb/uresb.vcxproj -text icu4c/source/samples/ustring/ustring.vcxproj -text icu4c/source/test/depstest/icu-dependencies-mode.el -text -icu4c/source/test/iotest/iotest.vcxproj -text icu4c/source/test/letest/cletest.vcxproj -text icu4c/source/test/letest/gendata.vcxproj -text icu4c/source/test/letest/letest.vcxproj -text @@ -124,7 +123,6 @@ icu4c/source/test/testdata/importtest.bin -text icu4c/source/test/testdata/old_e_testtypes.res -text icu4c/source/test/testdata/old_l_testtypes.res -text icu4c/source/test/testdata/uni-text.bin -text -icu4c/source/tools/ctestfw/ctestfw.vcxproj -text icu4c/source/tools/genbrk/genbrk.vcxproj -text icu4c/source/tools/genccode/genccode.vcxproj -text icu4c/source/tools/gencfu/gencfu.vcxproj -text diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index b61a1b3eec7..0646bc0b087 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -102,6 +102,7 @@ .\x86\Release/ Level3 true + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -143,6 +144,7 @@ Level3 true EditAndContinue + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -181,6 +183,7 @@ .\x64\Release/ Level3 true + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -220,6 +223,7 @@ Level3 true ProgramDatabase + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/icu4c/source/common/ustr_wcs.cpp b/icu4c/source/common/ustr_wcs.cpp index 59a58692ec3..1a8001f4723 100644 --- a/icu4c/source/common/ustr_wcs.cpp +++ b/icu4c/source/common/ustr_wcs.cpp @@ -254,7 +254,7 @@ u_strToWCS(wchar_t *dest, srcLength = u_strlen(src); } if(0 < srcLength && srcLength <= destCapacity){ - u_memcpy(dest, src, srcLength); + u_memcpy((UChar *)dest, src, srcLength); } if(pDestLength){ *pDestLength = srcLength; @@ -509,7 +509,7 @@ u_strFromWCS(UChar *dest, srcLength = u_strlen((const UChar *)src); } if(0 < srcLength && srcLength <= destCapacity){ - u_memcpy(dest, src, srcLength); + u_memcpy(dest, (const UChar *)src, srcLength); } if(pDestLength){ *pDestLength = srcLength; diff --git a/icu4c/source/common/wintz.cpp b/icu4c/source/common/wintz.cpp index 79526eb8082..c7d8efd3ec8 100644 --- a/icu4c/source/common/wintz.cpp +++ b/icu4c/source/common/wintz.cpp @@ -280,7 +280,7 @@ uprv_detectWindowsTimeZone() { int32_t len; int id; int errorCode; - UChar ISOcodeW[3]; /* 2 letter iso code in UTF-16*/ + wchar_t ISOcodeW[3]; /* 2 letter iso code in UTF-16*/ char ISOcodeA[3]; /* 2 letter iso code in ansi */ LONG result; @@ -312,8 +312,8 @@ uprv_detectWindowsTimeZone() { tmpid[0] = 0; id = GetUserGeoID(GEOCLASS_NATION); - errorCode = GetGeoInfoW(id,GEO_ISO2,ISOcodeW,3,0); - u_strToUTF8(ISOcodeA, 3, NULL, ISOcodeW, 3, &status); + errorCode = GetGeoInfoW(id, GEO_ISO2, ISOcodeW, 3, 0); + u_strToUTF8(ISOcodeA, 3, NULL, (const UChar *)ISOcodeW, 3, &status); bundle = ures_openDirect(NULL, "windowsZones", &status); ures_getByKey(bundle, "mapTimezones", bundle, &status); diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index 01610c4fe24..d54cff5f2b7 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -104,6 +104,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -231,6 +234,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index e118b55d0ed..1826fb739ae 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -104,6 +104,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -231,6 +234,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/icu4c/source/io/ufile.cpp b/icu4c/source/io/ufile.cpp index 8fb11ba19a2..9941fdfc589 100644 --- a/icu4c/source/io/ufile.cpp +++ b/icu4c/source/io/ufile.cpp @@ -25,6 +25,8 @@ #if !UCONFIG_NO_CONVERSION +#include + #include "ufile.h" #include "unicode/uloc.h" #include "unicode/ures.h" @@ -147,7 +149,11 @@ u_fopen_u(const UChar *filename, #if U_PLATFORM_USES_ONLY_WIN32_API /* Try Windows API _wfopen if the above fails. */ if (!result) { - FILE *systemFile = _wfopen(filename, (UChar*)perm); + // TODO: test this code path, including wperm. + wchar_t wperm[40] = {}; + size_t retVal; + mbstowcs_s(&retVal, wperm, perm, _TRUNCATE); + FILE *systemFile = _wfopen((const wchar_t *)filename, wperm); if (systemFile) { result = finit_owner(systemFile, locale, codepage, TRUE); } @@ -175,7 +181,7 @@ u_fstropen(UChar *stringBuf, result = (UFILE*) uprv_malloc(sizeof(UFILE)); /* Null pointer test */ if (result == NULL) { - return NULL; /* Just get out. */ + return NULL; /* Just get out. */ } uprv_memset(result, 0, sizeof(UFILE)); result->str.fBuffer = stringBuf; diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index 5fa067d068c..f7f8f1007ed 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -105,6 +105,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -188,6 +190,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -229,6 +232,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU index abe8832b662..009fc93cb40 100755 --- a/icu4c/source/runConfigureICU +++ b/icu4c/source/runConfigureICU @@ -263,10 +263,10 @@ case $platform in THE_COMP="Microsoft Visual C++" CC=cl; export CC CXX=cl; export CXX - RELEASE_CFLAGS='-Gy -MD' - RELEASE_CXXFLAGS='-Gy -MD' - DEBUG_CFLAGS='-Zi -MDd' - DEBUG_CXXFLAGS='-Zi -MDd' + RELEASE_CFLAGS='-Gy -MD -utf-8' + RELEASE_CXXFLAGS='-Gy -MD -utf-8' + DEBUG_CFLAGS='-Zi -MDd -utf-8' + DEBUG_CXXFLAGS='-Zi -MDd -utf-8' DEBUG_LDFLAGS='-DEBUG' ;; Cygwin/MSVC2005) diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj index 3eecbde5dc9..c7e409a94c0 100644 --- a/icu4c/source/test/cintltst/cintltst.vcxproj +++ b/icu4c/source/test/cintltst/cintltst.vcxproj @@ -103,6 +103,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -140,6 +141,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -179,6 +181,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -215,6 +218,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj index d14bb4f60ec..3779ffa2e22 100644 --- a/icu4c/source/test/intltest/intltest.vcxproj +++ b/icu4c/source/test/intltest/intltest.vcxproj @@ -104,6 +104,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -144,6 +145,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -177,6 +179,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -212,6 +215,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -356,16 +360,10 @@ false - false - false - false - false + false - false - false - false - false + false diff --git a/icu4c/source/test/iotest/iotest.vcxproj b/icu4c/source/test/iotest/iotest.vcxproj index 2764e5da05f..d4547442fa2 100644 --- a/icu4c/source/test/iotest/iotest.vcxproj +++ b/icu4c/source/test/iotest/iotest.vcxproj @@ -1,266 +1,270 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {E4993E82-D68A-46CA-BAE0-9D35E172E46F} - - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - Application - false - MultiByte - v140 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\x86\Debug\ - .\x86\Debug\ - - .\x86\Release\ - .\x86\Release\ - false - .\x64\Debug\ - .\x64\Debug\ - - .\x64\Release\ - .\x64\Release\ - false - - - - .\x86\Debug/iotest.tlb - - - - - Disabled - ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - .\x86\Debug/iotest.pch - .\x86\Debug/ - .\x86\Debug/ - .\x86\Debug/ - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\x86\Debug/iotest.exe - true - true - .\x86\Debug/iotest.pdb - Console - false - - - MachineX86 - - - - - .\x86\Release/iotest.tlb - - - ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - .\x86\Release/iotest.pch - .\x86\Release/ - .\x86\Release/ - .\x86\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\x86\Release/iotest.exe - true - .\x86\Release/iotest.pdb - Console - false - - - MachineX86 - - - - - X64 - .\x64\Debug/iotest.tlb - - - - - Disabled - ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - .\x64\Debug/iotest.pch - .\x64\Debug/ - .\x64\Debug/ - .\x64\Debug/ - true - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\x64\Debug/iotest.exe - true - true - .\x64\Debug/iotest.pdb - Console - MachineX64 - - - - - X64 - .\x64\Release/iotest.tlb - - - ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - .\x64\Release/iotest.pch - .\x64\Release/ - .\x64\Release/ - .\x64\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - .\x64\Release/iotest.exe - true - .\x64\Release/iotest.pdb - Console - MachineX64 - - - - - - - false - false - false - false - - - - - - - - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - false - - - {0178b127-6269-407d-b112-93877bb62776} - false - - - {c2b04507-2521-4801-bf0d-5fd79d6d518c} - false - - - {eca6b435-b4fa-4f9f-bf95-f451d078fc47} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E4993E82-D68A-46CA-BAE0-9D35E172E46F} + + + + Application + false + MultiByte + v140 + + + Application + false + MultiByte + v140 + + + Application + false + MultiByte + v140 + + + Application + false + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\x86\Debug\ + .\x86\Debug\ + + .\x86\Release\ + .\x86\Release\ + false + .\x64\Debug\ + .\x64\Debug\ + + .\x64\Release\ + .\x64\Release\ + false + + + + .\x86\Debug/iotest.tlb + + + + + Disabled + ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) + U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + .\x86\Debug/iotest.pch + .\x86\Debug/ + .\x86\Debug/ + .\x86\Debug/ + true + Level3 + true + EditAndContinue + Default + /utf-8 %(AdditionalOptions) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\x86\Debug/iotest.exe + true + true + .\x86\Debug/iotest.pdb + Console + false + + + MachineX86 + + + + + .\x86\Release/iotest.tlb + + + ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) + U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + .\x86\Release/iotest.pch + .\x86\Release/ + .\x86\Release/ + .\x86\Release/ + Level3 + true + Default + /utf-8 %(AdditionalOptions) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\x86\Release/iotest.exe + true + .\x86\Release/iotest.pdb + Console + false + + + MachineX86 + + + + + X64 + .\x64\Debug/iotest.tlb + + + + + Disabled + ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) + U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + .\x64\Debug/iotest.pch + .\x64\Debug/ + .\x64\Debug/ + .\x64\Debug/ + true + Level3 + true + ProgramDatabase + Default + /utf-8 %(AdditionalOptions) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\x64\Debug/iotest.exe + true + true + .\x64\Debug/iotest.pdb + Console + MachineX64 + + + + + X64 + .\x64\Release/iotest.tlb + + + ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) + U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + .\x64\Release/iotest.pch + .\x64\Release/ + .\x64\Release/ + .\x64\Release/ + Level3 + true + Default + /utf-8 %(AdditionalOptions) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + .\x64\Release/iotest.exe + true + .\x64\Release/iotest.pdb + Console + MachineX64 + + + + + + + false + false + false + false + + + + + + + + + + {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} + false + + + {0178b127-6269-407d-b112-93877bb62776} + false + + + {c2b04507-2521-4801-bf0d-5fd79d6d518c} + false + + + {eca6b435-b4fa-4f9f-bf95-f451d078fc47} + false + + + + + diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index 52f363f625d..7ca7bd036aa 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -1,285 +1,289 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {ECA6B435-B4FA-4F9F-BF95-F451D078FC47} - - - - DynamicLibrary - false - MultiByte - v140 - - - DynamicLibrary - false - MultiByte - v140 - - - DynamicLibrary - false - MultiByte - v140 - - - DynamicLibrary - false - MultiByte - v140 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - .\..\..\..\lib\ - .\x86\Release\ - false - .\..\..\..\lib\ - .\x86\Debug\ - true - .\x64\Release\ - .\x64\Release\ - false - .\x64\Debug\ - .\x64\Debug\ - true - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\lib\icutest.tlb - - - true - ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - .\x86\Release/icutest.pch - .\x86\Release/ - .\x86\Release/ - .\x86\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\..\bin\icutest59.dll - true - .\..\..\..\lib\icutest.pdb - true - UseLinkTimeCodeGeneration - false - - - .\..\..\..\lib\icutest.lib - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\..\..\..\lib\icutestd.tlb - - - Disabled - ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - .\x86\Debug/icutest.pch - .\x86\Debug/ - .\x86\Debug/ - .\x86\Debug/ - true - Level3 - true - EditAndContinue - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\..\bin\icutest59d.dll - true - true - .\..\..\..\lib\icutestd.pdb - false - - - .\..\..\..\lib\icutestd.lib - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\..\..\..\lib64\icutest.tlb - - - true - ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) - true - MultiThreadedDLL - true - true - true - .\x64\Release/icutest.pch - .\x64\Release/ - .\x64\Release/ - .\x64\Release/ - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\..\bin64\icutest59.dll - true - .\..\..\..\lib64\icutest.pdb - true - UseLinkTimeCodeGeneration - .\..\..\..\lib64\icutest.lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - X64 - .\..\..\..\lib64\icutestd.tlb - - - Disabled - ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - .\x64\Debug/icutest.pch - .\x64\Debug/ - .\x64\Debug/ - .\x64\Debug/ - true - Level3 - true - ProgramDatabase - Default - - - _DEBUG;%(PreprocessorDefinitions) - 0x0409 - - - ..\..\..\bin64\icutest59d.dll - true - true - .\..\..\..\lib64\icutestd.pdb - .\..\..\..\lib64\icutestd.lib - MachineX64 - - - - - - - false - - - false - - - false - - - false - - - - - - - - - - - - - - - {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} - false - - - {6b231032-3cb5-4eed-9210-810d666a23a0} - false - - - - - + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {ECA6B435-B4FA-4F9F-BF95-F451D078FC47} + + + + DynamicLibrary + false + MultiByte + v140 + + + DynamicLibrary + false + MultiByte + v140 + + + DynamicLibrary + false + MultiByte + v140 + + + DynamicLibrary + false + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + .\..\..\..\lib\ + .\x86\Release\ + false + .\..\..\..\lib\ + .\x86\Debug\ + true + .\x64\Release\ + .\x64\Release\ + false + .\x64\Debug\ + .\x64\Debug\ + true + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\..\..\..\lib\icutest.tlb + + + true + ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + true + .\x86\Release/icutest.pch + .\x86\Release/ + .\x86\Release/ + .\x86\Release/ + Level3 + true + Default + /utf-8 %(AdditionalOptions) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\..\bin\icutest59.dll + true + .\..\..\..\lib\icutest.pdb + true + UseLinkTimeCodeGeneration + false + + + .\..\..\..\lib\icutest.lib + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\..\..\..\lib\icutestd.tlb + + + Disabled + ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + .\x86\Debug/icutest.pch + .\x86\Debug/ + .\x86\Debug/ + .\x86\Debug/ + true + Level3 + true + EditAndContinue + Default + /utf-8 %(AdditionalOptions) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\..\bin\icutest59d.dll + true + true + .\..\..\..\lib\icutestd.pdb + false + + + .\..\..\..\lib\icutestd.lib + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\..\..\..\lib64\icutest.tlb + + + true + ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) + WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + true + true + .\x64\Release/icutest.pch + .\x64\Release/ + .\x64\Release/ + .\x64\Release/ + Level3 + true + Default + /utf-8 %(AdditionalOptions) + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\..\bin64\icutest59.dll + true + .\..\..\..\lib64\icutest.pdb + true + UseLinkTimeCodeGeneration + .\..\..\..\lib64\icutest.lib + MachineX64 + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\..\..\..\lib64\icutestd.tlb + + + Disabled + ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) + WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + .\x64\Debug/icutest.pch + .\x64\Debug/ + .\x64\Debug/ + .\x64\Debug/ + true + Level3 + true + ProgramDatabase + Default + /utf-8 %(AdditionalOptions) + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + ..\..\..\bin64\icutest59d.dll + true + true + .\..\..\..\lib64\icutestd.pdb + .\..\..\..\lib64\icutestd.lib + MachineX64 + + + + + + + false + + + false + + + false + + + false + + + + + + + + + + + + + + + {73c0a65b-d1f2-4de1-b3a6-15dad2c23f3d} + false + + + {6b231032-3cb5-4eed-9210-810d666a23a0} + false + + + + + diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index d858f0c3588..4ea19073005 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -105,6 +105,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -149,6 +150,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -191,6 +193,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -233,6 +236,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions)