Commit 4421c4c7 authored by Martin Finkel's avatar Martin Finkel

Mac: Support dylib instead of framework, enabling .NET Core Mac support

parent 45e3984f
......@@ -34,19 +34,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Mac.Sample", "S
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.WPF.Sample", "Samples\LibVLCSharp.WPF.Sample\LibVLCSharp.WPF.Sample.csproj", "{01CCB934-B77F-4681-86C5-AE4FEE648238}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Windows.Sample", "Samples\LibVLCSharp.Windows.Sample\LibVLCSharp.Windows.Sample.csproj", "{E9858A83-E619-4515-AF14-A87A4C658924}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.NetCore.Sample", "Samples\LibVLCSharp.Windows.Sample\LibVLCSharp.NetCore.Sample.csproj", "{E9858A83-E619-4515-AF14-A87A4C658924}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Windows.Net40.Sample", "Samples\LibVLCSharp.Windows.Net40.Sample\LibVLCSharp.Windows.Net40.Sample.csproj", "{DAFCBC34-7847-4EF9-ACC0-E025D6E3FBA4}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "LibVLCSharp.Android.AWindow", "LibVLCSharp.Android.AWindow\LibVLCSharp.Android.AWindow.csproj", "{FFFD0411-D0D8-4AA4-849C-C15483A413D2}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.Sample.Mac", "Samples\Forms\LibVLCSharp.Forms.Sample.Mac\LibVLCSharp.Forms.Sample.Mac.csproj", "{8771EDCF-0DA5-4AF8-80CE-5D3DC4999C7B}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "LibVLCSharp.Forms.Sample.WPF", "Samples\Forms\LibVLCSharp.Forms.WPF.Sample\LibVLCSharp.Forms.Sample.WPF.csproj", "{B829A790-FAA7-40F7-83FC-75D53867EC4D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Tests", "LibVLCSharp.Tests\LibVLCSharp.Tests.csproj", "{AD3A4C86-1839-4C42-9EB6-24CDA0DE30F9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.Sample.Mac", "Samples\Forms\LibVLCSharp.Forms.Sample.Mac\LibVLCSharp.Forms.Sample.Mac.csproj", "{8771EDCF-0DA5-4AF8-80CE-5D3DC4999C7B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibVLCSharp.Forms.Sample.WPF", "Samples\Forms\LibVLCSharp.Forms.WPF.Sample\LibVLCSharp.Forms.Sample.WPF.csproj", "{256C7141-442B-43DC-9321-0BCFE81E2421}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "LibVLCSharp.Tests", "LibVLCSharp.Tests\LibVLCSharp.Tests.csproj", "{AD3A4C86-1839-4C42-9EB6-24CDA0DE30F9}"
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "LibVLCSharp.Android.AWindow", "LibVLCSharp.Android.AWindow\LibVLCSharp.Android.AWindow.csproj", "{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}"
EndProject
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "LibVLCSharp.WPF", "LibVLCSharp.WPF\LibVLCSharp.WPF.csproj", "{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}"
Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "LibVLCSharp.WPF", "LibVLCSharp.WPF\LibVLCSharp.WPF.csproj", "{2C59DD65-6B71-4B71-827F-BA09525C5963}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -606,86 +606,6 @@ Global
{DAFCBC34-7847-4EF9-ACC0-E025D6E3FBA4}.Release|x64.Build.0 = Release|Any CPU
{DAFCBC34-7847-4EF9-ACC0-E025D6E3FBA4}.Release|x86.ActiveCfg = Release|Any CPU
{DAFCBC34-7847-4EF9-ACC0-E025D6E3FBA4}.Release|x86.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|Any CPU.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|iPhone.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|x64.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|x64.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|x86.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.AppStore|x86.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|iPhone.Build.0 = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|x64.ActiveCfg = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|x64.Build.0 = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|x86.ActiveCfg = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Debug|x86.Build.0 = Debug|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|Any CPU.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|iPhone.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|iPhone.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|x64.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|x64.Build.0 = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|x86.ActiveCfg = Release|Any CPU
{FFFD0411-D0D8-4AA4-849C-C15483A413D2}.Release|x86.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|Any CPU.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|iPhone.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|x64.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|x64.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|x86.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.AppStore|x86.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|iPhone.Build.0 = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|x64.ActiveCfg = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|x64.Build.0 = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|x86.ActiveCfg = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Debug|x86.Build.0 = Debug|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|Any CPU.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|iPhone.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|iPhone.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|x64.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|x64.Build.0 = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|x86.ActiveCfg = Release|Any CPU
{B829A790-FAA7-40F7-83FC-75D53867EC4D}.Release|x86.Build.0 = Release|Any CPU
{8771EDCF-0DA5-4AF8-80CE-5D3DC4999C7B}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{8771EDCF-0DA5-4AF8-80CE-5D3DC4999C7B}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{8771EDCF-0DA5-4AF8-80CE-5D3DC4999C7B}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
......@@ -766,46 +686,126 @@ Global
{AD3A4C86-1839-4C42-9EB6-24CDA0DE30F9}.Release|x64.Build.0 = Release|Any CPU
{AD3A4C86-1839-4C42-9EB6-24CDA0DE30F9}.Release|x86.ActiveCfg = Release|Any CPU
{AD3A4C86-1839-4C42-9EB6-24CDA0DE30F9}.Release|x86.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|Any CPU.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|iPhone.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|x64.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|x64.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|x86.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.AppStore|x86.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|iPhone.Build.0 = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|x64.ActiveCfg = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|x64.Build.0 = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|x86.ActiveCfg = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Debug|x86.Build.0 = Debug|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|Any CPU.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|iPhone.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|iPhone.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|x64.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|x64.Build.0 = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|x86.ActiveCfg = Release|Any CPU
{8ADD47B3-4F4A-438E-9DDC-53075B8A366E}.Release|x86.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|Any CPU.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|iPhone.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|x64.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|x64.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|x86.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.AppStore|x86.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|Any CPU.Build.0 = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|iPhone.Build.0 = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|x64.ActiveCfg = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|x64.Build.0 = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|x86.ActiveCfg = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Debug|x86.Build.0 = Debug|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|Any CPU.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|Any CPU.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|iPhone.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|iPhone.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|x64.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|x64.Build.0 = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|x86.ActiveCfg = Release|Any CPU
{256C7141-442B-43DC-9321-0BCFE81E2421}.Release|x86.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|Any CPU.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|iPhone.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|x64.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|x64.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|x86.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.AppStore|x86.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|iPhone.Build.0 = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|x64.ActiveCfg = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|x64.Build.0 = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|x86.ActiveCfg = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Debug|x86.Build.0 = Debug|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|Any CPU.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|iPhone.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|iPhone.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|x64.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|x64.Build.0 = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|x86.ActiveCfg = Release|Any CPU
{DF8C6537-E73B-41D2-ABE4-1365B6D29D19}.Release|x86.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|x64.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Ad-Hoc|x86.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|Any CPU.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|iPhone.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|iPhone.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|x64.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|x64.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|x86.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.AppStore|x86.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|iPhone.Build.0 = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|x64.ActiveCfg = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|x64.Build.0 = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|x86.ActiveCfg = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Debug|x86.Build.0 = Debug|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|Any CPU.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|iPhone.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|iPhone.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|x64.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|x64.Build.0 = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|x86.ActiveCfg = Release|Any CPU
{2C59DD65-6B71-4B71-827F-BA09525C5963}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -822,8 +822,8 @@ Global
{01CCB934-B77F-4681-86C5-AE4FEE648238} = {799A84A2-2161-4676-878B-5610E3586137}
{E9858A83-E619-4515-AF14-A87A4C658924} = {799A84A2-2161-4676-878B-5610E3586137}
{DAFCBC34-7847-4EF9-ACC0-E025D6E3FBA4} = {799A84A2-2161-4676-878B-5610E3586137}
{B829A790-FAA7-40F7-83FC-75D53867EC4D} = {FC68D8B7-758E-4164-945B-9F922FA883F6}
{8771EDCF-0DA5-4AF8-80CE-5D3DC4999C7B} = {FC68D8B7-758E-4164-945B-9F922FA883F6}
{256C7141-442B-43DC-9321-0BCFE81E2421} = {FC68D8B7-758E-4164-945B-9F922FA883F6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AB1424F9-871B-444A-9278-18227672889C}
......
......@@ -12,11 +12,14 @@ namespace LibVLCSharp.Shared
{
struct Native
{
[DllImport("kernel32.dll", SetLastError = true)]
[DllImport(Constants.Kernel32, SetLastError = true)]
internal static extern IntPtr LoadPackagedLibrary(string dllToLoad);
[DllImport("kernel32.dll", SetLastError = true)]
[DllImport(Constants.Kernel32, SetLastError = true)]
internal static extern IntPtr LoadLibrary(string dllToLoad);
[DllImport(Constants.libSystem)]
internal static extern IntPtr dlopen(string libraryPath, int mode = 1);
#if ANDROID
[DllImport(Constants.LibraryName, EntryPoint = "JNI_OnLoad")]
internal static extern int JniOnLoad(IntPtr javaVm, IntPtr reserved = default(IntPtr));
......@@ -86,9 +89,17 @@ namespace LibVLCSharp.Shared
throw new VLCException($"Failed to load required native library {Constants.LibraryName}.dll");
}
}
else if (IsMac)
{
_libvlcHandle = PreloadNativeLibrary(appExecutionDirectory, $"{Constants.LibraryName}.dylib");
if (_libvlcHandle == IntPtr.Zero)
{
throw new VLCException($"Failed to load required native library {Constants.LibraryName}.dylib");
}
}
}
//TODO: check if Store app
//TODO: Add dlopen for UWP, Linux
static IntPtr PreloadNativeLibrary(string nativeLibrariesPath, string libraryName)
{
Debug.WriteLine($"Loading {libraryName}");
......@@ -101,7 +112,7 @@ namespace LibVLCSharp.Shared
return IntPtr.Zero;
}
#endif
return Native.LoadLibrary(libraryPath);// TODO: cross-platform load
return IsMac ? Native.dlopen(libraryPath) : Native.LoadLibrary(libraryPath);
}
static bool IsWindows
......@@ -113,22 +124,22 @@ namespace LibVLCSharp.Shared
#endif
}
static bool IsX64BitProcess
static bool IsMac
{
#if NET40
get => Environment.Is64BitProcess;
get => (int)Environment.OSVersion.Platform == 6;
#else
get => RuntimeInformation.OSArchitecture == Architecture.X64;
get => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
#endif
}
static bool IsX64BitProcess => IntPtr.Size == 8;
}
internal static class Constants
{
#if IOS
internal const string LibraryName = "@rpath/DynamicMobileVLCKit.framework/DynamicMobileVLCKit";
#elif MAC
internal const string LibraryName = "@rpath/VLCKit.framework/VLCKit";
#elif UNITY_ANDROID
/// <summary>
/// The vlc-unity C++ plugin which handles rendering (opengl/d3d) libvlc callbacks
......@@ -153,6 +164,7 @@ namespace LibVLCSharp.Shared
internal const string Msvcrt = "msvcrt";
internal const string Libc = "libc";
internal const string libSystem = "libSystem";
internal const string Kernel32 = "kernel32";
}
internal static class ArchitectureNames
......
......@@ -99,5 +99,5 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
<Import Project="..\..\packages\VideoLAN.LibVLC.Mac.3.1.2-alpha\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.Mac.3.1.2-alpha\build\VideoLAN.LibVLC.Mac.targets')" />
<Import Project="..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" />
</Project>
\ No newline at end of file
......@@ -22,6 +22,8 @@ namespace LibVLCSharp.Mac.Sample
{
base.ViewDidLoad();
Core.Initialize();
_libVLC = new LibVLC();
_mediaPlayer = new Shared.MediaPlayer(_libVLC);
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="VideoLAN.LibVLC.Mac" version="3.1.2-alpha" targetFramework="xamarinmac20" />
<package id="VideoLAN.LibVLC.Mac" version="3.1.2" targetFramework="xamarinmac20" />
</packages>
\ No newline at end of file
......@@ -3,10 +3,11 @@
<OutputType>Exe</OutputType>
<TargetFrameworks>net47</TargetFrameworks>
<Platforms>AnyCPU;x64;x86</Platforms>
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
<RuntimeIdentifiers>win7-x64;win7-x86;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="VideoLAN.LibVLC.Windows" Version="3.0.4" />
<PackageReference Include="VideoLAN.LibVLC.Mac" Version="3.1.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\LibVLCSharp\LibVLCSharp.csproj" />
......
using System;
using LibVLCSharp.Shared;
namespace LibVLCSharp.Windows.Sample
namespace LibVLCSharp.NetCore.Sample
{
class Program
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment