summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj8
-rw-r--r--cpp/src/Slice/msbuild/slice.vcxproj8
-rw-r--r--cpp/src/slice2cpp/msbuild/packages.config4
-rw-r--r--cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj12
-rw-r--r--cpp/src/slice2cs/msbuild/packages.config4
-rw-r--r--cpp/src/slice2cs/msbuild/slice2cs.vcxproj12
-rw-r--r--cpp/src/slice2html/msbuild/packages.config4
-rw-r--r--cpp/src/slice2html/msbuild/slice2html.vcxproj12
-rw-r--r--cpp/src/slice2java/msbuild/packages.config4
-rw-r--r--cpp/src/slice2java/msbuild/slice2java.vcxproj12
-rw-r--r--cpp/src/slice2js/msbuild/packages.config4
-rw-r--r--cpp/src/slice2js/msbuild/slice2js.vcxproj12
-rw-r--r--cpp/src/slice2php/msbuild/packages.config4
-rw-r--r--cpp/src/slice2php/msbuild/slice2php.vcxproj12
-rw-r--r--cpp/src/slice2py/msbuild/packages.config4
-rw-r--r--cpp/src/slice2py/msbuild/slice2py.vcxproj12
16 files changed, 82 insertions, 46 deletions
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
index 320b34b7f10..ca9c94df0ff 100644
--- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -65,21 +65,25 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -145,4 +149,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/cpp/src/Slice/msbuild/slice.vcxproj b/cpp/src/Slice/msbuild/slice.vcxproj
index b5d159f532f..39152a54705 100644
--- a/cpp/src/Slice/msbuild/slice.vcxproj
+++ b/cpp/src/Slice/msbuild/slice.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -66,21 +66,25 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -91,4 +95,4 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project> \ No newline at end of file
diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2cpp/msbuild/packages.config
+++ b/cpp/src/slice2cpp/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
index 520d0f4dce0..59fa9851ea1 100644
--- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
+++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj
@@ -66,6 +66,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -74,6 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -82,6 +84,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -90,6 +93,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -118,15 +122,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2cs/msbuild/packages.config b/cpp/src/slice2cs/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2cs/msbuild/packages.config
+++ b/cpp/src/slice2cs/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
index cdf4dc6b1de..f65f6eb46a4 100644
--- a/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
+++ b/cpp/src/slice2cs/msbuild/slice2cs.vcxproj
@@ -67,6 +67,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -76,6 +77,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -85,6 +87,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -94,6 +97,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -126,15 +130,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/packages.config b/cpp/src/slice2html/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2html/msbuild/packages.config
+++ b/cpp/src/slice2html/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2html/msbuild/slice2html.vcxproj b/cpp/src/slice2html/msbuild/slice2html.vcxproj
index b82c737197c..9532d187f06 100644
--- a/cpp/src/slice2html/msbuild/slice2html.vcxproj
+++ b/cpp/src/slice2html/msbuild/slice2html.vcxproj
@@ -67,6 +67,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -76,6 +77,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -85,6 +87,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -94,6 +97,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -122,15 +126,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2java/msbuild/packages.config
+++ b/cpp/src/slice2java/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj
index a82097b2617..5d926d271ac 100644
--- a/cpp/src/slice2java/msbuild/slice2java.vcxproj
+++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj
@@ -67,6 +67,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -76,6 +77,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -85,6 +87,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -94,6 +97,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -123,15 +127,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2js/msbuild/packages.config b/cpp/src/slice2js/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2js/msbuild/packages.config
+++ b/cpp/src/slice2js/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2js/msbuild/slice2js.vcxproj b/cpp/src/slice2js/msbuild/slice2js.vcxproj
index 6d33900c5c0..5a78ca76f1a 100644
--- a/cpp/src/slice2js/msbuild/slice2js.vcxproj
+++ b/cpp/src/slice2js/msbuild/slice2js.vcxproj
@@ -66,6 +66,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -75,6 +76,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -84,6 +86,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -93,6 +96,7 @@
<ClCompile>
<AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -123,15 +127,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2php/msbuild/packages.config b/cpp/src/slice2php/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2php/msbuild/packages.config
+++ b/cpp/src/slice2php/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2php/msbuild/slice2php.vcxproj b/cpp/src/slice2php/msbuild/slice2php.vcxproj
index cbe34de9726..4476f82612c 100644
--- a/cpp/src/slice2php/msbuild/slice2php.vcxproj
+++ b/cpp/src/slice2php/msbuild/slice2php.vcxproj
@@ -66,6 +66,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -74,6 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -82,6 +84,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -90,6 +93,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -114,15 +118,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file
diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config
index 9a95568662e..2d6f1c8ced3 100644
--- a/cpp/src/slice2py/msbuild/packages.config
+++ b/cpp/src/slice2py/msbuild/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" />
- <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" />
+ <package id="mcpp.v120" version="2.7.2.11" targetFramework="native" />
+ <package id="mcpp.v140" version="2.7.2.11" targetFramework="native" />
</packages> \ No newline at end of file
diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj
index 16ec68dc561..111a2e0f723 100644
--- a/cpp/src/slice2py/msbuild/slice2py.vcxproj
+++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj
@@ -66,6 +66,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -74,6 +75,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -82,6 +84,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -90,6 +93,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PreprocessorDefinitions>ICE_STATIC_LIBS;ICE_BUILDING_SLICE_COMPILERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib;Shlwapi.lib</AdditionalDependencies>
@@ -114,15 +118,15 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
- <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" />
- <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" />
+ <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" />
- <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.11\build\native\mcpp.v120.targets'))" />
+ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.11\build\native\mcpp.v140.targets'))" />
</Target>
<Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" />
</Project> \ No newline at end of file