Skip to content

feat: impl XL_PLATFORM #1648

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −3
Open

feat: impl XL_PLATFORM #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d410b2
feat: impl XL_PLATFORM for windows
Blooym Nov 28, 2024
ee7b518
feat: impl XL_PLATFORM for unix
Blooym Nov 28, 2024
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
13 changes: 11 additions & 2 deletions src/XIVLauncher.Common.Unix/UnixGameRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using XIVLauncher.Common.Dalamud;
using XIVLauncher.Common.PlatformAbstractions;
using XIVLauncher.Common.Unix.Compatibility;
Expand All @@ -24,11 +25,19 @@ public UnixGameRunner(CompatibilityTools compatibility, DalamudLauncher dalamudL
{
if (dalamudOk)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
environment.Add("XL_PLATFORM", "Linux");
}
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{
environment.Add("XL_PLATFORM", "MacOS");
}
return this.dalamudLauncher.Run(new FileInfo(path), arguments, environment);
}
else
{
return compatibility.RunInPrefix($"\"{path}\" {arguments}", workingDirectory, environment, writeLog: true);
}
}
}
}
3 changes: 2 additions & 1 deletion src/XIVLauncher.Common.Windows/WindowsGameRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public Process Start(string path, string workingDirectory, string arguments, IDi
_ => throw new ArgumentOutOfRangeException()
};
environment.Add("__COMPAT_LAYER", compat);
environment.Add("XL_PLATFORM", "Windows");

var prevDalamudRuntime = Environment.GetEnvironmentVariable("DALAMUD_RUNTIME");
if (string.IsNullOrWhiteSpace(prevDalamudRuntime))
Expand All @@ -44,4 +45,4 @@ public Process Start(string path, string workingDirectory, string arguments, IDi
return NativeAclFix.LaunchGame(workingDirectory, path, arguments, environment, dpiAwareness, process => { });
}
}
}
}