From c4fec6596c02a6cdb6cec416f3d5bde42cd69c4b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Mon, 6 May 2019 13:06:16 +0200 Subject: [PATCH] Merge master into addSomeMoreStuffToGitIgnore Signed-off-by: Gabriel Ravier --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d7b7b2cd..26c1a783 100644 --- a/.gitignore +++ b/.gitignore @@ -14,17 +14,26 @@ build_jp/*.rec msvc2003/devilution/orig.asm msvc2003/devilution/compare.asm -# Exclude build output on Linux (exclude normally produced executable files) +# Exclude build output on Linux (exclude normally produced executable files and out files) build_en/CSE2 build_en/CSE2d build_en/DoConfig build_en/DoConfigd +*.out + +# The Makefile outputs "release" and "debug" for the english build +build_en/release +build_en/debug build_jp/CSE2 build_jp/CSE2d build_jp/DoConfig build_jp/DoConfigd +# The Makefile outputs "releasejp" and "debugjp" for the japanese build +build_jp/releasejp +build_jp/debugjp + # Exclude executables in the build folder (and .exe.manifest files) build_en/*.exe