diff options
| -rw-r--r-- | matlab/lib/slice2matlab.m | 2 | ||||
| -rw-r--r-- | matlab/src/msbuild/ice/ice.vcxproj | 23 |
2 files changed, 13 insertions, 12 deletions
diff --git a/matlab/lib/slice2matlab.m b/matlab/lib/slice2matlab.m index c83e7ce4ebe..128941ad384 100644 --- a/matlab/lib/slice2matlab.m +++ b/matlab/lib/slice2matlab.m @@ -32,7 +32,7 @@ function status = slice2matlab(args) path = findFile({'..\slice2matlab.exe' '..\..\cpp\bin\x64\Release\slice2matlab.exe' '..\..\cpp\bin\x64\Debug\slice2matlab.exe' - '..\msbuild\packages\zeroc.ice.v140\build\native\tools\slice2matlab.exe'}, rootDir, 2); + '..\msbuild\packages\zeroc.ice.v141\build\native\tools\slice2matlab.exe'}, rootDir, 2); searchPath = findFile({'..\slice' '..\..\slice'}, rootDir, 7); out = ''; diff --git a/matlab/src/msbuild/ice/ice.vcxproj b/matlab/src/msbuild/ice/ice.vcxproj index 5bdecc8d843..3cda6b27ee8 100644 --- a/matlab/src/msbuild/ice/ice.vcxproj +++ b/matlab/src/msbuild/ice/ice.vcxproj @@ -13,29 +13,30 @@ </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{89C40F1A-1761-46C1-B326-5B20BE6F8173}</ProjectGuid> - <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> <IceLanguageMapping>matlab</IceLanguageMapping> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> + <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\cpp\msbuild\ice.cpp11.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <OutDir>..\..\..\lib\$(Platform)\$(Configuration)\</OutDir> <TargetExt>.mexw64</TargetExt> + <TargetName>$(ProjectName)</TargetName> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <OutDir>..\..\..\lib\$(Platform)\$(Configuration)\</OutDir> <TargetExt>.mexw64</TargetExt> + <TargetName>$(ProjectName)</TargetName> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> @@ -91,17 +92,17 @@ </PropertyGroup> <Target Name="AfterClean"> <Delete Files="$(OutDir)\bzip2$(DebugExtension).dll" /> - <Delete Files="$(OutDir)\ice37++11$(DebugExtension).dll" /> - <Delete Files="$(OutDir)\icediscovery37++11$(DebugExtension).dll" /> - <Delete Files="$(OutDir)\icelocatordiscovery37++11$(DebugExtension).dll" /> - <Delete Files="$(OutDir)\icessl37++11$(DebugExtension).dll" /> + <Delete Files="$(OutDir)\ice38++11$(DebugExtension).dll" /> + <Delete Files="$(OutDir)\icediscovery38++11$(DebugExtension).dll" /> + <Delete Files="$(OutDir)\icelocatordiscovery38++11$(DebugExtension).dll" /> + <Delete Files="$(OutDir)\icessl38++11$(DebugExtension).dll" /> </Target> <Target Name="AfterBuild"> <Copy SourceFiles="$(IceBinPath)\bzip2$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> - <Copy SourceFiles="$(IceBinPath)\ice37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> - <Copy SourceFiles="$(IceBinPath)\icediscovery37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> - <Copy SourceFiles="$(IceBinPath)\icelocatordiscovery37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> - <Copy SourceFiles="$(IceBinPath)\icessl37++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> + <Copy SourceFiles="$(IceBinPath)\ice38++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> + <Copy SourceFiles="$(IceBinPath)\icediscovery38++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> + <Copy SourceFiles="$(IceBinPath)\icelocatordiscovery38++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> + <Copy SourceFiles="$(IceBinPath)\icessl38++11$(DebugExtension).dll" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true" /> </Target> <Target Name="MatlabHome" BeforeTargets="PrepareForBuild"> <Error Text="Cannot detect a valid MATLAB installation" Condition="!Exists('$(MatlabHome)')" /> |