Browse Source

Better handling of CvInvoke module loading. Do not build python2 wrapper on Windows. Fix documentation build.

UWP10
Canming Huang 10 years ago
parent
commit
29362c86c1
  1. 6
      Emgu.CV/PInvoke/CvInvoke.cs
  2. 2
      miscellaneous/Emgu.CV.html.shfbproj
  3. 1
      platforms/windows/Build_Binary_x86.bat

6
Emgu.CV/PInvoke/CvInvoke.cs

@ -134,14 +134,16 @@ namespace Emgu.CV
subfolder = "..";
}*/
System.Reflection.Assembly asm = System.Reflection.Assembly.GetExecutingAssembly();
System.Reflection.Assembly asm = typeof (CvInvoke).Assembly; //System.Reflection.Assembly.GetExecutingAssembly();
if (!File.Exists(asm.Location))
return false;
FileInfo file = new FileInfo(asm.Location);
//FileInfo file = new FileInfo(asm.CodeBase);
DirectoryInfo directory = file.Directory;
loadDirectory = directory.FullName;
if (!String.IsNullOrEmpty(subfolder))
loadDirectory = Path.Combine(loadDirectory, subfolder);
loadDirectory = Path.Combine(loadDirectory, subfolder);
#if (UNITY_STANDALONE_WIN && !UNITY_EDITOR_WIN)
if (directory.Parent != null)

2
miscellaneous/Emgu.CV.html.shfbproj

@ -40,7 +40,7 @@
<FooterText>For questions and discussions please visit http://www.emgu.com/forum</FooterText>
<PresentationStyle>VS2013</PresentationStyle>
<DocumentationSources>
<DocumentationSource sourceFile="..\Solution\VS2010_2012_2013\Emgu.CV.sln" />
<DocumentationSource sourceFile="..\Solution\VS2010-2015\Emgu.CV.sln" />
</DocumentationSources>
<NamespaceSummaries>
<NamespaceSummaryItem name="(global)" isDocumented="True">Emgu CV is a cross platform .Net wrapper to the OpenCV image processing library. Allowing OpenCV functions to be called from .NET compatible languages such as C#, VB, VC++, IronPython etc. The wrapper can be compiled in Mono and run on Windows, Linux, Mac OS X, iPhone, iPad and Android devices.</NamespaceSummaryItem>

1
platforms/windows/Build_Binary_x86.bat

@ -65,6 +65,7 @@ SET CMAKE_CONF_FLAGS= -G %CMAKE_CONF% ^
-DBUILD_opencv_apps:BOOL=FALSE ^
-DBUILD_opencv_adas:BOOL=FALSE ^
-DBUILD_opencv_bioinspired:BOOL=FALSE ^
-DBUILD_opencv_python2:BOOL=FALSE ^
-DEMGU_ENABLE_SSE:BOOL=TRUE ^
-DCMAKE_INSTALL_PREFIX="%TEMP%" ^
-DBUILD_WITH_DEBUG_INFO:BOOL=FALSE ^

Loading…
Cancel
Save