diff --git a/.gitattributes b/.gitattributes index 3d5d2bc7a1..8949d71eaf 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,22 +1,27 @@ -*.sh text eol=lf -*.s text eol=lf -Makefile text eol=lf -*.mk text eol=lf *.c text eol=lf *.h text eol=lf -*.inc text eol=lf -*.sha1 text eol=lf -*.json text eol=lf *.cpp text eol=lf *.hpp text eol=lf +*.s text eol=lf +*.inc text eol=lf +*.sh text eol=lf +*.py text eol=lf +*.sha1 text eol=lf +*.json text eol=lf +meson.build text eol=lf + .gitattributes text eol=lf .gitignore text eol=lf + *.md text eol=lf *.lsf text eol=lf *.yml text eol=lf +*.ini text eol=lf + lib/msl/include/MSL_C/* text eol=lf *.bin binary *.h linguist-language=C *.inc linguist-language=Assembly +*.py linguist-language=Python diff --git a/.gitignore b/.gitignore index c64de3e170..a29b1971fe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,7 @@ -# Object files -*.nds - -# Compilers -tools/mwccarm/** - -# SDK -tools/bin/** - -# Build folder -build/** -sub/build/** - # CLion folders .idea/ cmake-build-debug/ -# ROM -*.srl - -# Tool executables -*.exe - # Generated files *.4bpp *.lz @@ -33,17 +14,11 @@ cmake-build-debug/ # For decomp.me ctx.c -*.lcf.template -*.lcf -*.response.template -*.response - # Working files overlays/*/module_*.s overlays/*/module_*.sbin overlays/*/module_*.cfg -*.sbin *.bnr *.nbfp *.nbfc @@ -56,12 +31,8 @@ asmdiff.sh symbols.csv # NARCs -*.narc -*.arc -files/**/*.c +res/**/*.c *.o -*.naix -*.a # Utilities ntruncompbw @@ -78,6 +49,8 @@ cmake-build-* # Depfiles *.d +root.ini + diff.txt .vscode/ @@ -85,9 +58,7 @@ diff.txt temp_asm/ asm_old/ -!platinum.us/rom_header_template.sbin !platinum.us/banner.bnr -!sub/*.sbin uncrustify.cfg compare.sh @@ -96,3 +67,4 @@ diff/ sdk/ !tools/asmdiff/asmdiff.sh +