X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.gitignore;h=f9c664da6e33c33c58f3eb5200803665fed34e9d;hb=d5c3db9c4179e27a80c32ee95d6573ad0ec7137e;hp=e5c5c9d7b6f03f79da040a4e0880ab13b08f603b;hpb=2de91f11fb17a725d9a0ce6df5744b7bbbdb0f6a;p=dragonfireclient.git

diff --git a/.gitignore b/.gitignore
index e5c5c9d7b..f9c664da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,43 +1,86 @@
-## Generic ignorable patterns and files
+## Editors and Development environments
 *~
-.*.swp
-*bak*
-tags
+*.swp
+*.bak*
+*.orig
+# Vim
 *.vim
+# Kate
+.*.kate-swp
+.swp.*
+# KDevelop4
+.kdev4/
+*.kdev4
+# Eclipse (CDT and LDT)
+.project
+.cproject
+.settings/
+.buildpath
+.metadata
+# GNU Global
+tags
+!tags/
+gtags.files
 
-## Non-static Minetest directories
-bin/
-games/
-!games/mesetint
-cache/
-textures/
-sounds/
-mods/
-!mods/mesetint/mods_here.txt
-worlds/
-world/
+## Files related to minetest development cycle
+/*.patch
+# GNU Patch reject file
+*.rej
+
+## Non-static Minetest directories or symlinks to these
+/bin/
+/games/*
+!/games/minimal/
+/cache
+/textures/*
+!/textures/base/
+/screenshots
+/sounds
+/mods/*
+!/mods/minetest/
+/mods/minetest/*
+!/mods/minetest/mods_here.txt
+/worlds
+/world/
 
 ## Configuration/log files
 minetest.conf
 debug.txt
 
+## Doxygen files
+doc/Doxyfile
+doc/html/
+doc/doxygen_*
+
 ## Build files
-CMakeFiles/*
-src/CMakeFiles/*
-src/Makefile
-src/cmake_config.h
-src/cmake_install.cmake
-src/jthread/CMakeFiles/*
-src/jthread/Makefile
-src/jthread/cmake_config.h
-src/jthread/cmake_install.cmake
-src/jthread/libjthread.a
-src/lua/build/
-src/lua/CMakeFiles/
+CMakeFiles
+Makefile
+!build/android/Makefile
+cmake_install.cmake
 CMakeCache.txt
 CPackConfig.cmake
 CPackSourceConfig.cmake
-Makefile
-cmake_install.cmake
+src/android_version.h
+src/android_version_githash.h
+src/cmake_config.h
+src/cmake_config_githash.h
+src/lua/build/
 locale/
+.directory
+*.cbp
+*.layout
+*.o
+*.a
+
+## Android build files
+build/android/src/main/assets
+build/android/build
+build/android/deps
+build/android/libs
+build/android/jni/src
+build/android/src/main/jniLibs
+build/android/obj
+build/android/local.properties
+build/android/.gradle
+timestamp