chore: Cleanup submodules merge

This commit is contained in:
robshape 2023-04-15 10:58:01 +02:00
parent 4c64279f90
commit c7fe2abfb7
6 changed files with 8 additions and 11 deletions

7
.gitignore vendored
View file

@ -1,12 +1,19 @@
**/__pycache__/
**/glsm/
build/ build/
cores/output/ cores/output/
cores/src/ cores/src/
other/DinguxCommander/output/
private/ private/
releases/ releases/
src/boot/output/ src/boot/output/
*.[od]
*.dll
*.dtb *.dtb
*.dylib
*.elf *.elf
*.exe
*.o *.o
*.so *.so
*.zip *.zip

View file

@ -100,7 +100,7 @@ Run `./start-toolchain.sh` and then `make all` in the Docker container shell.
- Adjust overclocking - Adjust overclocking
- Include extras in release by default - Include extras in release by default
- Release using GitHub action: <https://github.com/JoeStaff/devilutionX/commit/a0fe502e70767ca8e2921d5580d4d4dec9e15cc1> - Release using GitHub action: <https://github.com/JoeStaff/devilutionX/commit/a0fe502e70767ca8e2921d5580d4d4dec9e15cc1>
- Automate installation guide - Automate installation
## Disclaimer ## Disclaimer

View file

@ -1 +0,0 @@
output/

View file

@ -1,6 +0,0 @@
glsm/
*.[od]
*.dll
*.so
*.dylib
*.exe

View file

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
git submodule init
git submodule update
cd toolchain cd toolchain
make shell make shell