Merge branch 'gitignore-stuff' into 'master'

.gitignore stuff The following changes have been made to `.gitignore` files in the objs/ and bin/ folders: * All the `.gitignore`s living in subfolders of objs/ have been done away with and replaced with a single `objs/.gitignore`, covering all the things that the subfolders ignored before (including depend.ped, if anyone is like me and has to remove that file manually) * All the `.gitignore`s living in subfolders of `bin/Mingw` ignore .exes of any name, not just srb2win/srb2dd/srb2sdl. en.mo is also ignored now... or rather any .mo file (just in case). This is mostly for my own sanity and that of anyone else who uses EXENAME=[name.exe] when compiling with MinGW. If you're not sure what `.gitignore` does exactly, as far as I'm aware it literally just tells Git what to "ignore" (or rather, not track), so anyone using Git GUI or some other Git program etc doesn't have to see changes certain files and can't accidentally commit the files or whatever. See merge request !174
2024-11-10 07:12:03 +00:00 · 2017-05-02 22:12:37 -04:00 · 2017-05-02 22:12:37 -04:00 · 30143d2e25
commit 30143d2e25
parent 7658469c23 d7a216e192
30 changed files with 14 additions and 59 deletions
--- a/bin/Mingw/Debug/.gitignore
+++ b/bin/Mingw/Debug/.gitignore
@ -1,3 +1,3 @@
-/srb2sdl.exe
-/srb2win.exe
-/r_opengl.dll
+*.exe
+*.mo
+r_opengl.dll
--- a/bin/Mingw/Release/.gitignore
+++ b/bin/Mingw/Release/.gitignore
@ -1,3 +1,3 @@
-/srb2sdl.exe
-/srb2win.exe
-/r_opengl.dll
+*.exe
+*.mo
+r_opengl.dll
--- a/objs/.gitignore
+++ b/objs/.gitignore
@ -0,0 +1,8 @@
+#All folders
+SRB2.res
+depend.dep
+depend.ped
+*.o
+#VC9 folder only
+/VC9/Win32
+/VC9/x64
--- a/objs/DC/SDL/Debug/.gitignore
+++ b/objs/DC/SDL/Debug/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/DC/SDL/Release/.gitignore
+++ b/objs/DC/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/Linux/SDL/Debug/.gitignore
+++ b/objs/Linux/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Linux/SDL/Release/.gitignore
+++ b/objs/Linux/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Linux64/SDL/Debug/.gitignore
+++ b/objs/Linux64/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Linux64/SDL/Release/.gitignore
+++ b/objs/Linux64/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Mingw/Debug/.gitignore
+++ b/objs/Mingw/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw/Release/.gitignore
+++ b/objs/Mingw/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw/SDL/Debug/.gitignore
+++ b/objs/Mingw/SDL/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw/SDL/Release/.gitignore
+++ b/objs/Mingw/SDL/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/Debug/.gitignore
+++ b/objs/Mingw64/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/Release/.gitignore
+++ b/objs/Mingw64/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/SDL/Debug/.gitignore
+++ b/objs/Mingw64/SDL/Debug/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/Mingw64/SDL/Release/.gitignore
+++ b/objs/Mingw64/SDL/Release/.gitignore
@ -1,3 +0,0 @@
-/SRB2.res
-/depend.dep
-/*.o
--- a/objs/PS3/SDL/Debug/.gitignore
+++ b/objs/PS3/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/PS3/SDL/Release/.gitignore
+++ b/objs/PS3/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/PSP/SDL/Release/.gitignore
+++ b/objs/PSP/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/SDL/Release/.gitignore
+++ b/objs/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.ped
--- a/objs/VC/.gitignore
+++ b/objs/VC/.gitignore
--- a/objs/VC9/.gitignore
+++ b/objs/VC9/.gitignore
@ -1,2 +0,0 @@
-/Win32
-/x64
--- a/objs/Wii/SDL/Debug/.gitignore
+++ b/objs/Wii/SDL/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/Wii/SDL/Release/.gitignore
+++ b/objs/Wii/SDL/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/WinCE/SDL/Release/.gitignore
+++ b/objs/WinCE/SDL/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/djgppdos/Debug/.gitignore
+++ b/objs/djgppdos/Debug/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/djgppdos/Release/.gitignore
+++ b/objs/djgppdos/Release/.gitignore
@ -1 +0,0 @@
-/depend.dep
--- a/objs/nds/Debug/.gitignore
+++ b/objs/nds/Debug/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o
--- a/objs/nds/Release/.gitignore
+++ b/objs/nds/Release/.gitignore
@ -1,2 +0,0 @@
-/depend.dep
-/*.o