Index: source/common/common.vcxproj |
diff --git a/source/common/common.vcxproj b/source/common/common.vcxproj |
index 18ca9a3dec2d8856981d327a4ede07c200d45a94..e6c9acffb497c280c50cca9079e0dc436a6e37a0 100644 |
--- a/source/common/common.vcxproj |
+++ b/source/common/common.vcxproj |
@@ -1,5 +1,5 @@ |
<?xml version="1.0" encoding="utf-8"?> |
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
<ItemGroup Label="ProjectConfigurations"> |
<ProjectConfiguration Include="Debug|Win32"> |
<Configuration>Debug</Configuration> |
@@ -26,21 +26,25 @@ |
<ConfigurationType>DynamicLibrary</ConfigurationType> |
<UseOfMfc>false</UseOfMfc> |
<CharacterSet>MultiByte</CharacterSet> |
+ <PlatformToolset>v140</PlatformToolset> |
</PropertyGroup> |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
<ConfigurationType>DynamicLibrary</ConfigurationType> |
<UseOfMfc>false</UseOfMfc> |
<CharacterSet>MultiByte</CharacterSet> |
+ <PlatformToolset>v140</PlatformToolset> |
</PropertyGroup> |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
<ConfigurationType>DynamicLibrary</ConfigurationType> |
<UseOfMfc>false</UseOfMfc> |
<CharacterSet>MultiByte</CharacterSet> |
+ <PlatformToolset>v140</PlatformToolset> |
</PropertyGroup> |
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
<ConfigurationType>DynamicLibrary</ConfigurationType> |
<UseOfMfc>false</UseOfMfc> |
<CharacterSet>MultiByte</CharacterSet> |
+ <PlatformToolset>v140</PlatformToolset> |
</PropertyGroup> |
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
<ImportGroup Label="ExtensionSettings"> |
@@ -104,7 +108,7 @@ |
<Culture>0x0409</Culture> |
</ResourceCompile> |
<Link> |
- <OutputFile>..\..\bin\icuuc56.dll</OutputFile> |
+ <OutputFile>..\..\bin\icuuc58.dll</OutputFile> |
<SuppressStartupBanner>true</SuppressStartupBanner> |
<ProgramDatabaseFile>.\..\..\lib\icuuc.pdb</ProgramDatabaseFile> |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
@@ -145,7 +149,7 @@ |
<Culture>0x0409</Culture> |
</ResourceCompile> |
<Link> |
- <OutputFile>..\..\bin\icuuc56d.dll</OutputFile> |
+ <OutputFile>..\..\bin\icuuc58d.dll</OutputFile> |
<SuppressStartupBanner>true</SuppressStartupBanner> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<ProgramDatabaseFile>.\..\..\lib\icuucd.pdb</ProgramDatabaseFile> |
@@ -183,7 +187,7 @@ |
<Culture>0x0409</Culture> |
</ResourceCompile> |
<Link> |
- <OutputFile>..\..\bin64\icuuc56.dll</OutputFile> |
+ <OutputFile>..\..\bin64\icuuc58.dll</OutputFile> |
<SuppressStartupBanner>true</SuppressStartupBanner> |
<ProgramDatabaseFile>.\..\..\lib64\icuuc.pdb</ProgramDatabaseFile> |
<EnableCOMDATFolding>true</EnableCOMDATFolding> |
@@ -222,7 +226,7 @@ |
<Culture>0x0409</Culture> |
</ResourceCompile> |
<Link> |
- <OutputFile>..\..\bin64\icuuc56d.dll</OutputFile> |
+ <OutputFile>..\..\bin64\icuuc58d.dll</OutputFile> |
<SuppressStartupBanner>true</SuppressStartupBanner> |
<GenerateDebugInformation>true</GenerateDebugInformation> |
<ProgramDatabaseFile>.\..\..\lib64\icuucd.pdb</ProgramDatabaseFile> |
@@ -234,6 +238,7 @@ |
<ItemGroup> |
<ClCompile Include="filteredbrk.cpp" /> |
<ClCompile Include="ubidi.c" /> |
+ <ClCompile Include="ubiditransform.c" /> |
<ClCompile Include="ubidi_props.c" /> |
<ClCompile Include="ubidiln.c" /> |
<ClCompile Include="ubidiwrt.c" /> |
@@ -365,6 +370,7 @@ |
</ClCompile> |
<ClCompile Include="locbased.cpp" /> |
<ClCompile Include="locdispnames.cpp" /> |
+ <ClCompile Include="locdspnm.cpp" /> |
<ClCompile Include="locid.cpp"> |
</ClCompile> |
<ClCompile Include="loclikely.cpp" /> |
@@ -381,6 +387,7 @@ |
<ClCompile Include="uresbund.cpp" /> |
<ClCompile Include="uresdata.cpp" /> |
<ClCompile Include="resource.cpp" /> |
+ <ClCompile Include="ucurr.cpp" /> |
<ClCompile Include="caniter.cpp"> |
</ClCompile> |
<ClCompile Include="filterednormalizer2.cpp" /> |
@@ -440,12 +447,13 @@ |
<ClCompile Include="chariter.cpp" /> |
<ClCompile Include="charstr.cpp" /> |
<ClCompile Include="cstring.c" /> |
+ <ClCompile Include="cstr.cpp" /> |
<ClCompile Include="cwchar.c" /> |
<ClCompile Include="messagepattern.cpp" /> |
<ClCompile Include="schriter.cpp" /> |
<ClCompile Include="stringpiece.cpp" /> |
<ClCompile Include="stringtriebuilder.cpp" /> |
- <ClCompile Include="simplepatternformatter.cpp" /> |
+ <ClCompile Include="simpleformatter.cpp" /> |
<ClCompile Include="ucasemap.cpp" /> |
<ClCompile Include="ucasemap_titlecase_brkiter.cpp" /> |
<ClCompile Include="ucharstrie.cpp" /> |
@@ -579,6 +587,7 @@ |
<ClInclude Include="uchar_props_data.h" /> |
<ClInclude Include="ucol_data.h" /> |
<ClInclude Include="ucol_swp.h" /> |
+ <ClInclude Include="unicode\ubiditransform.h" /> |
<ClInclude Include="unistrappender.h" /> |
<ClInclude Include="hash.h" /> |
<ClInclude Include="propsvec.h" /> |
@@ -1088,7 +1097,34 @@ |
</CustomBuild> |
<ClInclude Include="sharedobject.h" /> |
<ClCompile Include="sharedobject.cpp" /> |
- <ClInclude Include="simplepatternformatter.h" /> |
+ <CustomBuild Include="unicode\locdspnm.h"> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ </CustomBuild> |
+ <CustomBuild Include="unicode\simpleformatter.h"> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ </CustomBuild> |
<CustomBuild Include="unicode\ucat.h"> |
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
</Command> |
@@ -1103,6 +1139,34 @@ |
</Command> |
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
</CustomBuild> |
+ <CustomBuild Include="unicode\udisplaycontext.h"> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ </CustomBuild> |
+ <CustomBuild Include="unicode\uldnames.h"> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ </CustomBuild> |
<CustomBuild Include="unicode\uloc.h"> |
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
</Command> |
@@ -1137,6 +1201,21 @@ |
<ClInclude Include="uresimp.h" /> |
<ClInclude Include="ureslocs.h" /> |
<ClInclude Include="resource.h" /> |
+ <CustomBuild Include="unicode\ucurr.h"> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">copy "%(FullPath)" ..\..\include\unicode |
+</Command> |
+ <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs> |
+ </CustomBuild> |
+ <ClInclude Include="ucurrimp.h" /> |
<CustomBuild Include="unicode\caniter.h"> |
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
</Command> |
@@ -1451,6 +1530,7 @@ |
</CustomBuild> |
<ClInclude Include="charstr.h" /> |
<ClInclude Include="cstring.h" /> |
+ <ClInclude Include="cstr.h" /> |
<ClInclude Include="cwchar.h" /> |
<CustomBuild Include="unicode\messagepattern.h"> |
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">copy "%(FullPath)" ..\..\include\unicode |
@@ -1776,4 +1856,4 @@ |
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
<ImportGroup Label="ExtensionTargets"> |
</ImportGroup> |
-</Project> |
+</Project> |