diff options
| author | Markus Pfau <pfau@peak3d.de> | 2018-02-25 17:37:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 17:37:24 +0100 |
| commit | 1ed83d8293cfd12dece2e341f0b74ebb0dff16cb (patch) | |
| tree | ff24038e2a5d25540900be3450c918e5c73e8608 | |
| parent | 061798466437140d4f5bef3f5b59c6d658758e75 (diff) | |
| parent | cbb7bce5eee392c97a18c73fbe485e884131ae3d (diff) | |
Merge pull request #13580 from peak3d/gi
extend aarch64 pattern in .gitignore
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | tools/depends/.gitignore | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index b7df199f7b..977a809180 100644 --- a/.gitignore +++ b/.gitignore @@ -277,7 +277,6 @@ cmake_install.cmake /tools/depends/**/config.log /tools/depends/**/config.status /tools/depends/native/*/*native/ -/tools/depends/target/*/aarch64-linux-gnu/ /tools/depends/native/JsonSchemaBuilder/bin/ /tools/depends/native/TexturePacker/bin/ /tools/depends/target/ffmpeg/.ffmpeg-installed diff --git a/tools/depends/.gitignore b/tools/depends/.gitignore index 5595d05d9b..d26a459875 100644 --- a/tools/depends/.gitignore +++ b/tools/depends/.gitignore @@ -15,9 +15,10 @@ /target/*/x86/* /target/*/x86_64-linux-gnu-*/* /target/*/armeabi-v7a-*/* -/target/*/arm-linux-gnueabihf-*/* -/target/*/arm-linux-androideabi-*/* -/target/*/arm-linux-gnueabi-*/* +/target/*/arm*-linux-gnueabihf-*/* +/target/*/arm*-linux-androideabi-*/* +/target/*/arm*-linux-gnueabi-*/* +/target/*/aarch64-linux-gnu-*/* /target/*/macosx*.*_x86_64-target-*/ /target/*/macosx*.*_x86_64-target-*/* /target/*/macosx*.*_i386-target-*/ |