Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Mac libvlc loading refactoring #163

Draft
wants to merge 10 commits into
base: 3.x
Choose a base branch
from
Draft

Mac libvlc loading refactoring #163

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2b37cff
cocoa sample: update libvlc version
mfkl Jul 7, 2020
c481e3b
works on cocoa target
mfkl Jul 7, 2020
6800989
sorry
mfkl Jul 8, 2020
39d6955
fix libvlc loading for cocoa
mfkl Sep 8, 2020
ec45c8a
libvlc loading netcore/cocoa
mfkl Sep 10, 2020
b9a7078
some cleanup and todos
mfkl Sep 10, 2020
522f71f
revert packaging updates
mfkl Sep 10, 2020
d949891
remove netcoreapp used for testing
mfkl Sep 10, 2020
8b9dfe2
add net40 condition
mfkl Sep 14, 2020
2925ebc
Add helper for detecting whether we are running on dotnet or mono
mfkl Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix libvlc loading for cocoa
  • Loading branch information
@mfkl
mfkl committed Sep 10, 2020
commit 39d69556b34ac956cc8527e625c30f46c651cfab
3 changes: 1 addition & 2 deletions src/LibVLCSharp/Shared/Core/Core.Desktop.cs
View file
Original file line number Diff line number Diff line change
@@ -91,8 +91,7 @@ static void InitializeDesktop(string? libvlcDirectoryPath = null)
if (PlatformHelper.IsMac)
{
#if !NETSTANDARD1_1
var pluginPath = Path.Combine(Path.GetDirectoryName(typeof(LibVLC).Assembly.Location),
Constants.LibVLC, ArchitectureNames.MacOS64, Constants.Plugins);
var pluginPath = Path.Combine(Path.GetDirectoryName(typeof(LibVLC).Assembly.Location), Constants.Plugins);
Console.Out.WriteLine("PluginPath: " + pluginPath);
PluginPath(pluginPath);
#endif