Skip to content

Commit e2269f9

Browse files
committed
Consolidate repeated platform strings into constants in Windows builders
Add PlatformId const to each Windows builder class and Architectureconst to WindowsArm64Define to eliminate repeated string literals.
1 parent 5e334f7 commit e2269f9

1 file changed

Lines changed: 17 additions & 10 deletions

File tree

Assets/Plugins/Source/Editor/Platforms/Windows/WindowsBuilder.cs

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ namespace PlayEveryWare.EpicOnlineServices.Editor.Build
5353
internal static class WindowsArm64Define
5454
{
5555
public const string Symbol = "EOS_PLATFORM_WINDOWS_ARM64";
56+
internal const string Architecture = "ARM64";
5657

5758
#if UNITY_6000_0_OR_NEWER
5859
/// <summary>
@@ -81,7 +82,7 @@ public static bool IsArm64Active()
8182
"Architecture");
8283
if (!string.IsNullOrEmpty(arch))
8384
{
84-
return string.Equals(arch, "ARM64", System.StringComparison.OrdinalIgnoreCase);
85+
return string.Equals(arch, Architecture, System.StringComparison.OrdinalIgnoreCase);
8586
}
8687
}
8788
catch (Exception ex)
@@ -206,17 +207,19 @@ private static void DisableArm64Define()
206207
/// </summary>
207208
public class WindowsBuilder64 : WindowsBuilder
208209
{
209-
public WindowsBuilder64() : base("Plugins/Windows/x64", BuildTarget.StandaloneWindows64)
210+
private const string PlatformId = "x64";
211+
212+
public WindowsBuilder64() : base($"Plugins/Windows/{PlatformId}", BuildTarget.StandaloneWindows64)
210213
{
211214
AddProjectFileToBinaryMapping(
212215
"DynamicLibraryLoaderHelper/DynamicLibraryLoaderHelper.sln",
213-
"DynamicLibraryLoaderHelper-x64.dll",
214-
"GfxPluginNativeRender-x64.dll");
216+
$"DynamicLibraryLoaderHelper-{PlatformId}.dll",
217+
$"GfxPluginNativeRender-{PlatformId}.dll");
215218
}
216219

217220
public override string GetPlatformString()
218221
{
219-
return "x64";
222+
return PlatformId;
220223
}
221224

222225
protected override bool ShouldHandle(BuildReport report)
@@ -258,17 +261,19 @@ public override void PreBuild(BuildReport report)
258261
/// </summary>
259262
public class WindowsBuilderArm64 : WindowsBuilder
260263
{
261-
public WindowsBuilderArm64() : base("Plugins/Windows/ARM64", BuildTarget.StandaloneWindows64)
264+
private const string PlatformId = WindowsArm64Define.Architecture;
265+
266+
public WindowsBuilderArm64() : base($"Plugins/Windows/{PlatformId}", BuildTarget.StandaloneWindows64)
262267
{
263268
AddProjectFileToBinaryMapping(
264269
"DynamicLibraryLoaderHelper/DynamicLibraryLoaderHelper.sln",
265-
"DynamicLibraryLoaderHelper-ARM64.dll",
266-
"GfxPluginNativeRender-ARM64.dll");
270+
$"DynamicLibraryLoaderHelper-{PlatformId}.dll",
271+
$"GfxPluginNativeRender-{PlatformId}.dll");
267272
}
268273

269274
public override string GetPlatformString()
270275
{
271-
return "ARM64";
276+
return PlatformId;
272277
}
273278

274279
protected override bool ShouldHandle(BuildReport report)
@@ -305,6 +310,8 @@ public override void PreBuild(BuildReport report)
305310
/// </summary>
306311
public class WindowsBuilder32 : WindowsBuilder
307312
{
313+
private const string PlatformId = "Win32";
314+
308315
public WindowsBuilder32() : base("Plugins/Windows/x86", BuildTarget.StandaloneWindows)
309316
{
310317
// TODO: These libraries do not appear to be building properly - and the process
@@ -318,7 +325,7 @@ public WindowsBuilder32() : base("Plugins/Windows/x86", BuildTarget.StandaloneWi
318325

319326
public override string GetPlatformString()
320327
{
321-
return "Win32";
328+
return PlatformId;
322329
}
323330
}
324331

0 commit comments

Comments
 (0)