Revert "Refactoring and code style fixes in preparation of adding mesh typed items"

[oweals/minetest.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ee210c7c0b1fc55d7407b130940abbc4b32a4adc..cd6ee3e32110ee3f64d99171f5cd878f00bfe0b6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,45 +1,87 @@
-## 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
+
+## Files related to minetest development cycle
+/*.patch
+# GNU Patch reject file
+*.rej
 
-## Non-static Minetest directories
+## Non-static Minetest directories or symlinks to these
 /bin/
 /games/*
 !/games/minimal/
-/cache/
-/textures/
-/sounds/
+/cache
+/textures/*
+!/textures/base/
+/screenshots
+/sounds
 /mods/*
 !/mods/minetest/
 /mods/minetest/*
 !/mods/minetest/mods_here.txt
-/worlds/
+/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/assets
+build/android/bin
+build/android/Debug
+build/android/deps
+build/android/gen
+build/android/jni/src
+build/android/libs
+build/android/obj
+build/android/path.cfg
+build/android/and_env
+build/android/AndroidManifest.xml
+timestamp