Browse Source

Fix .gitignore ignores part of the committed repo.

Ben Rog-Wilhelm 2 years ago
parent
commit
37d68929e8
2 changed files with 6 additions and 10 deletions
  1. 6 3
      .gitignore
  2. 0 7
      misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json

+ 6 - 3
.gitignore

@@ -243,9 +243,6 @@ xcuserdata/
 x64/
 x64/
 x86/
 x86/
 
 
-# Do not ignore x86 folders anywhere under thirdparty libraries
-!thirdparty/**/x86/
-
 [Ww][Ii][Nn]32/
 [Ww][Ii][Nn]32/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]/
 [Aa][Rr][Mm]64/
 [Aa][Rr][Mm]64/
@@ -255,6 +252,12 @@ bld/
 [Ll]og/
 [Ll]og/
 [Ll]ogs/
 [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
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 .vs/
 
 

+ 0 - 7
misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json

@@ -1,7 +0,0 @@
-{
-    "file_format_version" : "1.0.0",
-    "ICD": {
-        "library_path": "./../../Frameworks/MoltenVK.framework/MoltenVK",
-        "api_version" : "1.0.0"
-    }
-}