From 6afb0a4e55e324c00b094e8dacee7db1f0c9c43b Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:38:19 +0000 Subject: [PATCH 1/5] build: set right path to xlcommon unix in solution --- src/XIVLauncher.Core.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XIVLauncher.Core.sln b/src/XIVLauncher.Core.sln index 634eee18..01824ce3 100644 --- a/src/XIVLauncher.Core.sln +++ b/src/XIVLauncher.Core.sln @@ -16,7 +16,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", "..\lib\FFXIVQuickLauncher\src\XIVLauncher.Common.Unix\XIVLauncher.Common.Unix.csproj", "{08CE4E78-7C47-43D6-98CB-68655DEAF66A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XIVLauncher.Common.Unix", "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 From 88c4dfe2032bf47e450d1e6186ecf88bd48472eb Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:52:02 +0000 Subject: [PATCH 2/5] feat: impl XL_PLATFORM for Linux XL_PLATFORM for windows was implemented via a seperate PR at https://github.com/goatcorp/FFXIVQuickLauncher/pull/1648. XoM uses their own fork of XLCommon that isn't the one in this repository, so it's fine to assume its only Linux here I think, I don't know anyone using this on a Mac --- src/XIVLauncher.Common.Unix/UnixGameRunner.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/XIVLauncher.Common.Unix/UnixGameRunner.cs b/src/XIVLauncher.Common.Unix/UnixGameRunner.cs index e612377d..f11369e3 100644 --- a/src/XIVLauncher.Common.Unix/UnixGameRunner.cs +++ b/src/XIVLauncher.Common.Unix/UnixGameRunner.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; + using XIVLauncher.Common.Dalamud; using XIVLauncher.Common.PlatformAbstractions; using XIVLauncher.Common.Unix.Compatibility; @@ -24,6 +25,7 @@ public UnixGameRunner(CompatibilityTools compatibility, DalamudLauncher dalamudL { if (dalamudOk) { + environment.Add("XL_PLATFORM", "Linux"); return this.dalamudLauncher.Run(new FileInfo(path), arguments, environment); } else From 3db8a0d7bd56ca7a633089f1d0fc62b93406257d Mon Sep 17 00:00:00 2001 From: Blooym <19539165+Blooym@users.noreply.github.com> Date: Thu, 28 Nov 2024 12:56:42 +0000 Subject: [PATCH 3/5] check for MacOS too --- src/XIVLauncher.Common.Unix/UnixGameRunner.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/XIVLauncher.Common.Unix/UnixGameRunner.cs b/src/XIVLauncher.Common.Unix/UnixGameRunner.cs index f11369e3..a9ded8f0 100644 --- a/src/XIVLauncher.Common.Unix/UnixGameRunner.cs +++ b/src/XIVLauncher.Common.Unix/UnixGameRunner.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; +using System.Runtime.InteropServices; using XIVLauncher.Common.Dalamud; using XIVLauncher.Common.PlatformAbstractions; @@ -25,7 +26,14 @@ public UnixGameRunner(CompatibilityTools compatibility, DalamudLauncher dalamudL { if (dalamudOk) { - environment.Add("XL_PLATFORM", "Linux"); + 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 From fedb044306df1878d5d03cc83ae17c075d7fc808 Mon Sep 17 00:00:00 2001 From: Lyna <19539165+Blooym@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:02:16 +0000 Subject: [PATCH 4/5] revert change from other branch --- src/XIVLauncher.Core.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/XIVLauncher.Core.sln b/src/XIVLauncher.Core.sln index 01824ce3..f8aa5ce0 100644 --- a/src/XIVLauncher.Core.sln +++ b/src/XIVLauncher.Core.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29215.179 @@ -16,7 +16,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 From 4e69e8053fb357698cbe9b4e72601116f1440992 Mon Sep 17 00:00:00 2001 From: Lyna <19539165+Blooym@users.noreply.github.com> Date: Thu, 28 Nov 2024 13:02:26 +0000 Subject: [PATCH 5/5] Update XIVLauncher.Core.sln --- src/XIVLauncher.Core.sln | 1 - 1 file changed, 1 deletion(-) diff --git a/src/XIVLauncher.Core.sln b/src/XIVLauncher.Core.sln index f8aa5ce0..d09fd3dd 100644 --- a/src/XIVLauncher.Core.sln +++ b/src/XIVLauncher.Core.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29215.179