Mirror
/
EmguCV
mirror of https://github.com/emgucv/emgucv.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Fix Xamarin Forms OSX build

pull/262/head
Canming Huang 6 years ago
parent
84597ef470
commit
df7458ce77
7 changed files with 60 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      Emgu.CV.Contrib/Emgu.CV.Contrib.projitems
  2. 18
      Emgu.CV.Example/Mac/Emgu.CV.Example.Mac.csproj
  3. 33
      Emgu.CV.Example/XamarinForms/Mac/OSX.csproj
  4. 2
      Emgu.CV.Example/XamarinForms/Mac/packages.config
  5. 8
      Emgu.CV.Example/XamarinForms/iOS/Info.plist
  6. 2
      Emgu.CV.World/Emgu.CV.World.Mac.csproj
  7. 2
      Solution/Mac/Emgu.CV.Mac.Example.sln

18
Emgu.CV.Contrib/Emgu.CV.Contrib.projitems
View File

@ -10,24 +10,24 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)Dpm\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Saliency\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Saliency\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XFeatures2D\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Face\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Text\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Freetype\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Freetype\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)BgSegm\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XImgproc\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XImgproc\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XPhoto\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Tracking\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Plot\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Aruco\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Fuzzy\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Hfs\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Hfs\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)LineDescriptor\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XObjdetect\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bioinspired\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DnnModern\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ImgHash\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PhaseUnwrapping\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)XObjdetect\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Bioinspired\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DnnModern\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ImgHash\*.cs" />
<Compile Include="$(MSBuildThisFileDirectory)PhaseUnwrapping\*.cs" />
</ItemGroup>
</Project>

18
Emgu.CV.Example/Mac/Emgu.CV.Example.Mac.csproj
View File

@ -77,6 +77,24 @@
<XamMacArch></XamMacArch>
<AssemblyName>Emgu.CV.Example.Mac</AssemblyName>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<UseSGen>false</UseSGen>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<UseSGen>false</UseSGen>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />

33
Emgu.CV.Example/XamarinForms/Mac/OSX.csproj
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props')" />
<Import Project="..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\build\Xamarin.Forms.props" Condition="Exists('..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@ -10,8 +10,8 @@
<RootNamespace>OSX</RootNamespace>
<AssemblyName>OSX</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@ -34,6 +34,7 @@
<TlsProvider></TlsProvider>
<LinkMode></LinkMode>
<XamMacArch></XamMacArch>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugType>pdbonly</DebugType>
@ -49,18 +50,21 @@
<IncludeMonoRuntime>true</IncludeMonoRuntime>
<UseSGen>true</UseSGen>
<UseRefCounting>true</UseRefCounting>
<LinkMode>SdkOnly</LinkMode>
<LinkMode>None</LinkMode>
<PlatformTarget>x86</PlatformTarget>
<HttpClientHandler></HttpClientHandler>
<TlsProvider></TlsProvider>
<XamMacArch></XamMacArch>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<UseSGen>false</UseSGen>
<OutputPath>.</OutputPath>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
@ -73,6 +77,7 @@
<HttpClientHandler></HttpClientHandler>
<LinkMode></LinkMode>
<XamMacArch></XamMacArch>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>false</Optimize>
@ -84,24 +89,31 @@
<HttpClientHandler></HttpClientHandler>
<LinkMode></LinkMode>
<XamMacArch></XamMacArch>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<UseSGen>false</UseSGen>
<AOTMode>None</AOTMode>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@ -112,16 +124,16 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="OpenTK" />
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.macOS">
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@ -153,6 +165,10 @@
<Link>test_image.png</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\Core\dog416.png">
<Link>dog416.png</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
@ -188,11 +204,12 @@
<ItemGroup>
<InterfaceDefinition Include="Main.storyboard" />
</ItemGroup>
<Import Project="..\..\..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems" Label="Shared" Condition="Exists('..\..\..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems')" />
<Import Project="..\..\..\Emgu.CV.OCR\Emgu.CV.OCR.projitems" Label="Shared" Condition="Exists('..\..\..\Emgu.CV.OCR\Emgu.CV.OCR.projitems')" />
<Import Project="..\..\..\Emgu.CV\Emgu.CV.projitems" Label="Shared" Condition="Exists('..\..\..\Emgu.CV\Emgu.CV.projitems')" />
<Import Project="..\..\..\Emgu.CV.Cuda\Emgu.CV.Cuda.projitems" Label="Shared" Condition="Exists('..\..\..\Emgu.CV.Cuda\Emgu.CV.Cuda.projitems')" />
<Import Project="..\Core\Emgu.CV.XamarinForms.projitems" Label="Shared" Condition="Exists('..\Core\Emgu.CV.XamarinForms.projitems')" />
<Import Project="..\..\..\Emgu.Util\Emgu.Util.projitems" Label="Shared" Condition="Exists('..\..\..\Emgu.Util\Emgu.Util.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\nugetpackages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets')" />
<Import Project="..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\build\Xamarin.Forms.targets" Condition="Exists('..\..\..\nugetpackages\Xamarin.Forms.3.6.0.220655\build\Xamarin.Forms.targets')" />
</Project>

2
Emgu.CV.Example/XamarinForms/Mac/packages.config
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xamarin.Forms" version="2.5.0.280555" targetFramework="xamarinmac20" />
<package id="Xamarin.Forms" version="3.6.0.220655" targetFramework="xamarinmac20" />
</packages>

8
Emgu.CV.Example/XamarinForms/iOS/Info.plist
View File

@ -51,10 +51,10 @@
<string>This app needs access to the camera to take photos.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>This app needs access to photos.</string>
<key>NSMicrophoneUsageDescription</key>
<string>This app needs access to microphone.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>This app needs access to the photo gallery.</string>
<key>NSMicrophoneUsageDescription</key>
<string>This app needs access to microphone.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>This app needs access to the photo gallery.</string>
<key>CFBundleName</key>
<string>Emgu CV XamarinForms</string>
</dict>

2
Emgu.CV.World/Emgu.CV.World.Mac.csproj
View File

@ -45,8 +45,8 @@
<ItemGroup>
<ObjcBindingApiDefinition Include="ApiDefinition.cs" />
</ItemGroup>
<Import Project="..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems" Label="Shared" Condition="Exists('..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems')" />
<Import Project="..\Emgu.CV\Emgu.CV.projitems" Label="Shared" />
<Import Project="..\Emgu.CV.Contrib\Emgu.CV.Contrib.projitems" Label="Shared" />
<Import Project="..\Emgu.CV.Cuda\Emgu.CV.Cuda.projitems" Label="Shared" />
<Import Project="..\Emgu.CV.OCR\Emgu.CV.OCR.projitems" Label="Shared" />
<Import Project="..\Emgu.Util\Emgu.Util.projitems" Label="Shared" />

2
Solution/Mac/Emgu.CV.Mac.Example.sln
View File

@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emgu.CV.World.Mac", "..\..\
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.CV.OCR", "..\..\Emgu.CV.OCR\Emgu.CV.OCR.shproj", "{7BC723CB-1678-415F-A65F-4027F8758A6F}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.CV.Contrib", "..\..\Emgu.CV.Contrib\Emgu.CV.Contrib.shproj", "{11E54A7E-778D-466C-A176-71E150976AC1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86

Write Preview
Loading…
Cancel
Save