Skip to content

Commit 0072831

Browse files
author
shimat
committed
Merge branch 'CPlusPlus-Improvement-features2d'
Conflicts: nuget/OpenCvSharp-x64.nupkg nuget/OpenCvSharp-x86.nupkg
2 parents 3f860d2 + 29cf5b6 commit 0072831

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

nuget/OpenCvSharp-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp-x64</id>
5-
<version>2.4.8.20140502</version>
5+
<version>2.4.8.20140503</version>
66
<title>OpenCvSharp x64</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>

nuget/OpenCvSharp-x86.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp-x86</id>
5-
<version>2.4.8.20140502</version>
5+
<version>2.4.8.20140503</version>
66
<title>OpenCvSharp x86</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>

nuget/tools-x64/install.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function MarkFileAsCopy($item)
2323
}
2424

2525
$copyFiles = @(
26-
"msvcp100.dll";
27-
"msvcr100.dll";
26+
"msvcp110.dll";
27+
"msvcr110.dll";
2828
"OpenCvSharpExtern.dll";
2929
"opencv_calib3d248.dll";
3030
"opencv_contrib248.dll";

nuget/tools-x86/install.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function MarkFileAsCopy($item)
2323
}
2424

2525
$copyFiles = @(
26-
"msvcp100.dll";
27-
"msvcr100.dll";
26+
"msvcp110.dll";
27+
"msvcr110.dll";
2828
"OpenCvSharpExtern.dll";
2929
"opencv_calib3d248.dll";
3030
"opencv_contrib248.dll";

src/OpenCvSharpExternGpu/OpenCvSharpExternGpu.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,14 @@
5353
<UseDebugLibraries>false</UseDebugLibraries>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
56-
<PlatformToolset>v100</PlatformToolset>
56+
<PlatformToolset>v110</PlatformToolset>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5959
<ConfigurationType>DynamicLibrary</ConfigurationType>
6060
<UseDebugLibraries>false</UseDebugLibraries>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
<CharacterSet>Unicode</CharacterSet>
63+
<PlatformToolset>v110</PlatformToolset>
6364
</PropertyGroup>
6465
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6566
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)