From c7fe2abfb787c0c0b6b175a56d6d378be190c918 Mon Sep 17 00:00:00 2001
From: robshape <robshape@users.noreply.github.com>
Date: Sat, 15 Apr 2023 10:58:01 +0200
Subject: [PATCH] chore: Cleanup submodules merge

---
 .gitignore                                                 | 7 +++++++
 README.md                                                  | 2 +-
 other/DinguxCommander/.gitignore                           | 1 -
 src/minarch/libretro-common/.gitignore                     | 6 ------
 .../translation scripts/intl/.gitignore                    | 1 -
 start-toolchain.sh                                         | 2 --
 6 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 other/DinguxCommander/.gitignore
 delete mode 100644 src/minarch/libretro-common/.gitignore
 delete mode 100644 src/minarch/libretro-common/samples/core_options/example_translation/translation scripts/intl/.gitignore

diff --git a/.gitignore b/.gitignore
index 9553419..45806b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,19 @@
+**/__pycache__/
+**/glsm/
 build/
 cores/output/
 cores/src/
+other/DinguxCommander/output/
 private/
 releases/
 src/boot/output/
 
+*.[od]
+*.dll
 *.dtb
+*.dylib
 *.elf
+*.exe
 *.o
 *.so
 *.zip
diff --git a/README.md b/README.md
index 08af7ce..fcf13a3 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ Run `./start-toolchain.sh` and then `make all` in the Docker container shell.
 - Adjust overclocking
 - Include extras in release by default
 - Release using GitHub action: <https://github.com/JoeStaff/devilutionX/commit/a0fe502e70767ca8e2921d5580d4d4dec9e15cc1>
-- Automate installation guide
+- Automate installation
 
 ## Disclaimer
 
diff --git a/other/DinguxCommander/.gitignore b/other/DinguxCommander/.gitignore
deleted file mode 100644
index ea1472e..0000000
--- a/other/DinguxCommander/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-output/
diff --git a/src/minarch/libretro-common/.gitignore b/src/minarch/libretro-common/.gitignore
deleted file mode 100644
index 4e88cc3..0000000
--- a/src/minarch/libretro-common/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-glsm/
-*.[od]
-*.dll
-*.so
-*.dylib
-*.exe
diff --git a/src/minarch/libretro-common/samples/core_options/example_translation/translation scripts/intl/.gitignore b/src/minarch/libretro-common/samples/core_options/example_translation/translation scripts/intl/.gitignore
deleted file mode 100644
index bee8a64..0000000
--- a/src/minarch/libretro-common/samples/core_options/example_translation/translation scripts/intl/.gitignore	
+++ /dev/null
@@ -1 +0,0 @@
-__pycache__
diff --git a/start-toolchain.sh b/start-toolchain.sh
index a1b28c8..d434de4 100755
--- a/start-toolchain.sh
+++ b/start-toolchain.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 set -euo pipefail
 
-git submodule init
-git submodule update
 cd toolchain
 make shell