Skip to content

Commit 6bf59b1

Browse files
JordiFBfacebook-github-bot
authored andcommitted
Fixed iOS resolver DLL configuration for Windows devices.
Summary: Fixed iOS resolver DLL configuration for Windows devices. Reviewed By: SergioGuerreroFB Differential Revision: D37878323 fbshipit-source-id: ffc1ba430835ea24b238e35f36d8201a52adb1c9
1 parent 1da57ee commit 6bf59b1

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

Facebook.Unity.Editor/FacebookImporter.cs

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
4949
SetiOSEditorSwiftConfiguration("/FBSDKTournamentFetcher.swift");
5050
SetiOSEditorSwiftConfiguration("/FBSDKTournamentUpdater.swift");
5151

52+
SetiOSResolverConfiguration("/Google.IOSResolver.dll");
53+
5254
SetWindowsDllConfiguration("/Facebook.Unity.Windows.dll", WindowsArchitecture.both);
5355

5456
// Windows SDK Dlls x84 and x64
@@ -82,12 +84,12 @@ static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAsse
8284

8385
private static PluginImporter GetPluginImporter(string path)
8486
{
85-
return ((PluginImporter)PluginImporter.GetAtPath("Assets/FacebookSDK"+path));
87+
return ((PluginImporter)PluginImporter.GetAtPath("Assets"+path));
8688
}
8789

8890
private static void SetCanvasDllConfiguration(string path)
8991
{
90-
PluginImporter canvasDLL = GetPluginImporter("/Plugins/Canvas" + path);
92+
PluginImporter canvasDLL = GetPluginImporter("/FacebookSDK/Plugins/Canvas" + path);
9193
if (canvasDLL)
9294
{
9395
canvasDLL.SetCompatibleWithAnyPlatform(false);
@@ -97,7 +99,7 @@ private static void SetCanvasDllConfiguration(string path)
9799

98100
private static void SetAndroidDllConfiguration(string path)
99101
{
100-
PluginImporter androidDLL = GetPluginImporter("/Plugins/Android" + path);
102+
PluginImporter androidDLL = GetPluginImporter("/FacebookSDK/Plugins/Android" + path);
101103
if (androidDLL)
102104
{
103105
androidDLL.SetCompatibleWithAnyPlatform(false);
@@ -107,7 +109,7 @@ private static void SetAndroidDllConfiguration(string path)
107109

108110
private static void SetiOSDllConfiguration(string path)
109111
{
110-
PluginImporter iOSDLL = GetPluginImporter("/Plugins/iOS" + path);
112+
PluginImporter iOSDLL = GetPluginImporter("/FacebookSDK/Plugins/iOS" + path);
111113
if (iOSDLL)
112114
{
113115
iOSDLL.SetCompatibleWithAnyPlatform(false);
@@ -117,7 +119,7 @@ private static void SetiOSDllConfiguration(string path)
117119

118120
private static void SetiOSEditorSwiftConfiguration(string path)
119121
{
120-
PluginImporter iOSDLL = GetPluginImporter("/SDK/Editor/iOS/Swift" + path);
122+
PluginImporter iOSDLL = GetPluginImporter("/FacebookSDK/SDK/Editor/iOS/Swift" + path);
121123
if (iOSDLL)
122124
{
123125
iOSDLL.SetCompatibleWithAnyPlatform(false);
@@ -126,9 +128,21 @@ private static void SetiOSEditorSwiftConfiguration(string path)
126128
}
127129
}
128130

131+
private static void SetiOSResolverConfiguration(string path)
132+
{
133+
PluginImporter iOSDLL = GetPluginImporter("/ExternalDependencyManager/Editor" + path);
134+
if (iOSDLL)
135+
{
136+
iOSDLL.SetCompatibleWithAnyPlatform(false);
137+
iOSDLL.SetCompatibleWithEditor(true);
138+
iOSDLL.SetEditorData("OS", "macOS");
139+
iOSDLL.SetEditorData("CPU", "AnyCPU");
140+
}
141+
}
142+
129143
private static void SetWindowsDllConfiguration(string path, WindowsArchitecture architecture)
130144
{
131-
PluginImporter windowsDLL = GetPluginImporter("/Plugins/Windows" + path);
145+
PluginImporter windowsDLL = GetPluginImporter("/FacebookSDK/Plugins/Windows" + path);
132146
if (windowsDLL)
133147
{
134148
bool isEditor = architecture == WindowsArchitecture.x86_64 || architecture == WindowsArchitecture.both;

0 commit comments

Comments
 (0)