diff options
author | Ben Rog-Wilhelm <zorba-github@pavlovian.net> | 2022-10-21 14:06:42 -0500 |
---|---|---|
committer | RĂ©mi Verschelde <rverschelde@gmail.com> | 2023-02-17 13:48:16 +0100 |
commit | 37d68929e8ab3a1cab550a4cb83152eb13012f8c (patch) | |
tree | 7ad141472114376773969c1c9913d2271e664ad4 | |
parent | e80e21b5e8bfb0af04b5d87bfdfc67ffe95121ac (diff) |
Fix .gitignore ignores part of the committed repo.
-rw-r--r-- | .gitignore | 9 | ||||
-rw-r--r-- | misc/dist/ios_xcode/godot_ios/vulkan/icd.d/MoltenVK_icd.json | 7 |
2 files changed, 6 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index e9beb26e7e..17c9a6c95a 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 7501cb548c..0000000000 --- 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" - } -} |