diff options
| author | Jose <jose@zeroc.com> | 2017-04-20 08:12:37 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-04-20 08:12:37 +0200 |
| commit | cc82669355e32cc855a48fb4211e56a2abaf51d0 (patch) | |
| tree | 6d33b343cc05fac3c38bd4145ad8b12586578b59 /cpp/src/slice2java | |
| parent | Fix UWP package names in build instructions (diff) | |
| download | ice-cc82669355e32cc855a48fb4211e56a2abaf51d0.tar.bz2 ice-cc82669355e32cc855a48fb4211e56a2abaf51d0.tar.xz ice-cc82669355e32cc855a48fb4211e56a2abaf51d0.zip | |
Visual Studio 2010 support
Diffstat (limited to 'cpp/src/slice2java')
| -rw-r--r-- | cpp/src/slice2java/msbuild/packages.config | 1 | ||||
| -rw-r--r-- | cpp/src/slice2java/msbuild/slice2java.vcxproj | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/slice2java/msbuild/packages.config b/cpp/src/slice2java/msbuild/packages.config index 3843006e3cd..06d81257299 100644 --- a/cpp/src/slice2java/msbuild/packages.config +++ b/cpp/src/slice2java/msbuild/packages.config @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <packages> + <package id="mcpp.v100" version="2.7.2.13" targetFramework="native" /> <package id="mcpp.v120" version="2.7.2.12" targetFramework="native" /> <package id="mcpp.v140" version="2.7.2.12" targetFramework="native" /> <package id="mcpp.v141" version="2.7.2.12" targetFramework="native" /> diff --git a/cpp/src/slice2java/msbuild/slice2java.vcxproj b/cpp/src/slice2java/msbuild/slice2java.vcxproj index 5f5609bd59e..14ad6b0b925 100644 --- a/cpp/src/slice2java/msbuild/slice2java.vcxproj +++ b/cpp/src/slice2java/msbuild/slice2java.vcxproj @@ -23,6 +23,9 @@ <RootNamespace>slice2java</RootNamespace> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> + <PropertyGroup> + <DefaultPlatformToolset Condition="'$(VisualStudioVersion)' == '10.0' And '$(DefaultPlatformToolset)' == ''">v100</DefaultPlatformToolset> + </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> @@ -129,6 +132,7 @@ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> @@ -137,6 +141,7 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v100.2.7.2.13\build\native\mcpp.v100.targets'))" /> </Target> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> </Project>
\ No newline at end of file |