Merge branch 'CPlusPlus-Improvement-features2d'

Conflicts: nuget/OpenCvSharp-x64.nupkg nuget/OpenCvSharp-x86.nupkg
shimat · May 2, 2014 · 0072831 · 0072831
2 parents 3f860d2 + 29cf5b6
commit 0072831
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/nuget/OpenCvSharp-x64.nuspec b/nuget/OpenCvSharp-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>OpenCvSharp-x64</id>
-        <version>2.4.8.20140502</version>
+        <version>2.4.8.20140503</version>
         <title>OpenCvSharp x64</title>
         <authors>shimat</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>

diff --git a/nuget/OpenCvSharp-x86.nuspec b/nuget/OpenCvSharp-x86.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>OpenCvSharp-x86</id>
-        <version>2.4.8.20140502</version>
+        <version>2.4.8.20140503</version>
         <title>OpenCvSharp x86</title>
         <authors>shimat</authors>
         <licenseUrl>http://www.gnu.org/licenses/lgpl-3.0.en.html</licenseUrl>

diff --git a/nuget/tools-x64/install.ps1 b/nuget/tools-x64/install.ps1
@@ -23,8 +23,8 @@ function MarkFileAsCopy($item)
 }
 
 $copyFiles = @(
-    "msvcp100.dll";
-    "msvcr100.dll";
+    "msvcp110.dll";
+    "msvcr110.dll";
     "OpenCvSharpExtern.dll";
     "opencv_calib3d248.dll";
     "opencv_contrib248.dll";

diff --git a/nuget/tools-x86/install.ps1 b/nuget/tools-x86/install.ps1
@@ -23,8 +23,8 @@ function MarkFileAsCopy($item)
 }
 
 $copyFiles = @(
-    "msvcp100.dll";
-    "msvcr100.dll";
+    "msvcp110.dll";
+    "msvcr110.dll";
     "OpenCvSharpExtern.dll";
     "opencv_calib3d248.dll";
     "opencv_contrib248.dll";

diff --git a/src/OpenCvSharpExternGpu/OpenCvSharpExternGpu.vcxproj b/src/OpenCvSharpExternGpu/OpenCvSharpExternGpu.vcxproj
@@ -53,13 +53,14 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">