From 37d68929e8ab3a1cab550a4cb83152eb13012f8c Mon Sep 17 00:00:00 2001
From: Ben Rog-Wilhelm <zorba-github@pavlovian.net>
Date: Fri, 21 Oct 2022 14:06:42 -0500
Subject: [PATCH] Fix .gitignore ignores part of the committed repo.

---
 .gitignore                                               | 9 ++++++---
 .../ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json   | 7 -------
 2 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json

diff --git a/.gitignore b/.gitignore
index e9beb26e7ef..17c9a6c95af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -243,9 +243,6 @@ xcuserdata/
 x64/
 x86/
 
-# Do not ignore x86 folders anywhere under thirdparty libraries
-!thirdparty/**/x86/
-
 [Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
@@ -255,6 +252,12 @@ bld/
 [Ll]og/
 [Ll]ogs/
 
+# Do not ignore arch-specific folders anywhere under thirdparty libraries
+!thirdparty/**/x64/
+!thirdparty/**/x86/
+!thirdparty/**/arm/
+!thirdparty/**/arm64/
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 
diff --git a/misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json b/misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json
deleted file mode 100644
index 7501cb548c8..00000000000
--- a/misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "file_format_version" : "1.0.0",
-    "ICD": {
-        "library_path": "./../../Frameworks/MoltenVK.framework/MoltenVK",
-        "api_version" : "1.0.0"
-    }
-}