Skip to content

Commit 1dc0b75

Browse files
authored
Merge eebc45a into 15cf58c
2 parents 15cf58c + eebc45a commit 1dc0b75

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

CefSharp/DependencyChecker.cs

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55
using System;
66
using System.Collections.Generic;
77
using System.IO;
8+
using System.Linq;
89
using System.Reflection;
10+
#if NETCOREAPP
11+
using System.Runtime.InteropServices;
12+
#endif
913
using System.Text;
1014

1115
namespace CefSharp
@@ -54,16 +58,25 @@ public static class DependencyChecker
5458
/// <summary>
5559
/// List of Optional CEF Dependencies
5660
/// </summary>
57-
public static string[] CefOptionalDependencies =
61+
public static string[] CefOptionalDependencies = new string[]
5862
{
59-
// Angle and Direct3D support
63+
// Angle support
6064
// Note: Without these components HTML5 accelerated content like 2D canvas, 3D CSS and WebGL will not function.
6165
"libEGL.dll",
6266
"libGLESv2.dll",
63-
"d3dcompiler_47.dll",
6467
//Crashpad support
6568
"chrome_elf.dll"
66-
};
69+
}.Concat(
70+
#if NETCOREAPP
71+
RuntimeInformation.ProcessArchitecture is Architecture.Arm64 ?
72+
Array.Empty<string>() :
73+
#endif
74+
new string[]
75+
{
76+
// Direct3D support (only for x86/x64)
77+
"d3dcompiler_47.dll"
78+
})
79+
.ToArray();
6780

6881
/// <summary>
6982
/// List of CefSharp Managed Dependencies (Those that are AnyCPU written in c#)

0 commit comments

Comments
 (0)