Merge branch 'accurate' into portable

This commit is contained in:
Clownacy 2020-04-02 14:19:51 +01:00
commit 199e21623e

15
.gitignore vendored
View file

@ -1,6 +1,9 @@
# Exclude obj directory (object files for Makefile build) # Exclude obj directory (object files for Makefile build)
/obj /obj
# Exclude the (recommended) CMake build directory
/build
# Exclude executables # Exclude executables
/game_english/CSE2_debug.exe /game_english/CSE2_debug.exe
/game_english/DoConfig_debug.exe /game_english/DoConfig_debug.exe
@ -47,21 +50,9 @@
/vs2003/Debug (Japanese) /vs2003/Debug (Japanese)
/vs2003/Release (Japanese) /vs2003/Release (Japanese)
# Exclude Visual Studio 2017 files
/vs2017/Debug
/vs2017/Release
/vs2017/Debug (Japanese)
/vs2017/Release (Japanese)
/vs2017/x64
/vs2017/.vs
/vs2017/CSE2.vcxproj.user
#### ####
# Portable branch # Portable branch
#### ####
# Exclude converted resource files # Exclude converted resource files
/src/Resource /src/Resource
# Exclude the (recommended) CMake build directory
/build