summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2016-06-01 21:08:31 -0300
committerGeorge Marques <george@gmarqu.es>2016-06-01 21:14:57 -0300
commit408c26ce0bc3847ed956a6993faa2619cd942da2 (patch)
tree50b0cc9c7593eb242e71f623a16da3fe95b1e904 /.gitignore
parentcc0a7b24e760512c4a17e54371c3308cd082c266 (diff)
Remove Make-related flags from Android build
They were wrongly placed, creating a file named "-fpic" instead of applying "-fpic" to the build. This file was in .gitignore, which made it less noticiable. This also adds build.gradle to .gitignore.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ef17e13534..e1941b18df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ tools/editor/certs_compressed.h
tools/editor/editor_icons.cpp
tools/editor/translations.h
tools/editor/builtin_fonts.h
--fpic
.fscache
make.bat
log.txt
@@ -33,6 +32,7 @@ doc/_build/
*.bc
# Android specific
+platform/android/java/build.gradle
platform/android/java/.gradle
platform/android/java/.gradletasknamecache
platform/android/java/local.properties