duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'accurate' into portable

Browse source
This commit is contained in:
Clownacy 2020-01-09 06:39:34 +00:00
commit c831031ba4
2 changed files with 41 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitattributes vendored
View file

@ -8,3 +8,6 @@
# Do not change external files # Do not change external files
external/** -text external/** -text
DoConfig/fltk/** -text DoConfig/fltk/** -text
# TSC files are not text, but 'git diff' likes to think they are
*.tsc binary

41
.gitignore vendored
View file

@ -1,11 +1,44 @@
# Exclude obj directory (object files for Makefile build) # Exclude obj directory (object files for Makefile build)
/obj /obj
# Exclude converted resource files
src/Resource
# Exclude build output directory # Exclude build output directory
/game /game
####
# Accurate branch
####
# Exclude devilution-comparer assembly output
/devilution/orig.asm
/devilution/compare.asm
# Exclude MSVC IntelliSense database
/vs2003/CSE2.ncb
# Exclude MSVC Solution User Options file
/vs2003/CSE2.suo
# Exclude MSVC build folders
/vs2003/Debug
/vs2003/Release
/vs2003/Debug (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
####
# Exclude converted resource files
/src/Resource
# Exclude the (recommended) CMake build directory # Exclude the (recommended) CMake build directory
build/* /build