Skip to content

Implement XL_PLATFORM for Unix #198

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

Merged
merged 4 commits into from
Mar 25, 2025
Merged

Implement XL_PLATFORM for Unix #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88c4dfe
feat: impl XL_PLATFORM for Linux
Blooym Nov 28, 2024
3db8a0d
check for MacOS too
Blooym Nov 28, 2024
fedb044
revert change from other branch
Blooym Nov 28, 2024
4e69e80
Update XIVLauncher.Core.sln
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
10 changes: 10 additions & 0 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,8 @@
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,6 +26,14 @@ 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
Expand Down
3 changes: 1 addition & 2 deletions src/XIVLauncher.Core.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29215.179
Expand All @@ -16,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Common.Windows"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Core", "XIVLauncher.Core\XIVLauncher.Core.csproj", "{05A1B3C0-0795-4045-AE37-474D4A73B1EE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Common.Unix", "XIVLauncher.Common.Unix\XIVLauncher.Common.Unix.csproj", "{08CE4E78-7C47-43D6-98CB-68655DEAF66A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Common.Unix", "..\lib\FFXIVQuickLauncher\src\XIVLauncher.Common.Unix\XIVLauncher.Common.Unix.csproj", "{08CE4E78-7C47-43D6-98CB-68655DEAF66A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.VersionGenerator", "XIVLauncher.VersionGenerator\XIVLauncher.VersionGenerator.csproj", "{1F476606-D4C4-4808-8A41-FC22326B7D30}"
EndProject
Expand Down
Loading