diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-17 14:06:23 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-02-17 14:06:23 +0100 |
| commit | 1e3f42fccbf680f9e8d70af5ff114373d5e4ebab (patch) | |
| tree | c2e331d82673d08f628f73c92d917079ed3db63a | |
| parent | da11c59918721ab44e8986ce47ab3d65764c4e28 (diff) | |
| parent | 37d68929e8ab3a1cab550a4cb83152eb13012f8c (diff) | |
Merge pull request #47212 from zorbathut/pr_gitignore
Fix: .gitignore files ignore part of the 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" - } -} |