From 65181b565ecec836eeed33114c368770dfa0c392 Mon Sep 17 00:00:00 2001
From: KeatonTheBot <keaton@ryujinx.app>
Date: Wed, 9 Sep 2026 20:30:27 -0500
Subject: [PATCH] Move JSON files to root directory

---
 .../macos/vulkan/icd.d/MoltenVK_icd-flat.json      |  2 +-
 .../vulkan/icd.d/libkosmickrisp_icd-flat.json      |  4 ++--
 src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs        |  2 +-
 src/Ryujinx/Ryujinx.csproj                         | 14 ++++++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/distribution/macos/vulkan/icd.d/MoltenVK_icd-flat.json b/distribution/macos/vulkan/icd.d/MoltenVK_icd-flat.json
index 2b26d3a25..ccdd6bcf9 100644
--- a/distribution/macos/vulkan/icd.d/MoltenVK_icd-flat.json
+++ b/distribution/macos/vulkan/icd.d/MoltenVK_icd-flat.json
@@ -1,7 +1,7 @@
 {
     "file_format_version" : "1.0.0",
     "ICD": {
-        "library_path": "../../libMoltenVK.dylib",
+        "library_path": "./libMoltenVK.dylib",
         "api_version" : "1.4.0",
         "is_portability_driver" : true
     }
diff --git a/distribution/macos/vulkan/icd.d/libkosmickrisp_icd-flat.json b/distribution/macos/vulkan/icd.d/libkosmickrisp_icd-flat.json
index 3f82fcc9d..40a21acc9 100644
--- a/distribution/macos/vulkan/icd.d/libkosmickrisp_icd-flat.json
+++ b/distribution/macos/vulkan/icd.d/libkosmickrisp_icd-flat.json
@@ -1,7 +1,7 @@
 {
     "ICD": {
         "api_version": "1.3.0",
-        "library_path": "../../libvulkan_kosmickrisp.dylib"
+        "library_path": "./libvulkan_kosmickrisp.dylib"
     },
     "file_format_version": "1.0.1"
-}
\ No newline at end of file
+}
diff --git a/src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs b/src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs
index 37f5fef3e..551f5bc9c 100644
--- a/src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs
+++ b/src/Ryujinx.Graphics.Vulkan/VulkanDriver.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.Graphics.Vulkan
             string[] searchPaths =
             [
                 Path.Combine(contentsDir, "Resources", "vulkan", "icd.d", fileName),
-                Path.Combine(contentsDir, "vulkan", "icd.d", fileName)
+                Path.Combine(contentsDir, fileName)
             ];
 
             foreach (string icdPath in searchPaths)
diff --git a/src/Ryujinx/Ryujinx.csproj b/src/Ryujinx/Ryujinx.csproj
index 3a6513a26..3d69b4def 100644
--- a/src/Ryujinx/Ryujinx.csproj
+++ b/src/Ryujinx/Ryujinx.csproj
@@ -91,15 +91,17 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-arm64' OR '$(RuntimeIdentifier)' == 'osx-x64'">
-    <Content Include="..\..\distribution\macos\vulkan\icd.d\MoltenVK_icd-flat.json"
-          CopyToOutputDirectory="PreserveNewest"
-          Link="vulkan\icd.d\MoltenVK_icd.json" />
+    <Content Include="..\..\distribution\macos\vulkan\icd.d\MoltenVK_icd-flat.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>MoltenVK_icd.json</TargetPath>
+    </Content>
   </ItemGroup>
 
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
-    <Content Include="..\..\distribution\macos\vulkan\icd.d\libkosmickrisp_icd-flat.json"
-          CopyToOutputDirectory="PreserveNewest"
-          Link="vulkan\icd.d\libkosmickrisp_icd.json" />
+    <Content Include="..\..\distribution\macos\vulkan\icd.d\libkosmickrisp_icd-flat.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <TargetPath>libkosmickrisp_icd.json</TargetPath>
+    </Content>
   </ItemGroup>
   
   <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' OR '$(RuntimeIdentifier)' == 'linux-arm64'" >