Merge master into addSomeMoreStuffToGitIgnore

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>
This commit is contained in:
Gabriel Ravier 2019-05-06 13:06:16 +02:00
parent 45cde7e4a3
commit c4fec6596c

11
.gitignore vendored
View file

@ -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