From 50ae7ab5584a907c6b7c8390d8dbe409efdaf42c Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Fri, 7 Jun 2024 11:36:15 -0500
Subject: [PATCH] updated build system

---
 scripts/create_containers.sh | 7 ++++++-
 scripts/make_win32.cmd       | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/scripts/create_containers.sh b/scripts/create_containers.sh
index 6ea29f20..95bac831 100755
--- a/scripts/create_containers.sh
+++ b/scripts/create_containers.sh
@@ -3,7 +3,12 @@
 CURRENT_DIR=$(dirname "$0")
 CURRENT_DIR=$(realpath ${CURRENT_DIR})
 
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1> /dev/null 2>&1
+. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1
+
+if [ -f "${CURRENT_DIR}/cleanup.sh" ]; then
+  . "${CURRENT_DIR}/cleanup.sh" "$1" "$2" "$3" "$4" "$5"
+  rm ${CURRENT_DIR}/cleanup.*
+fi
 
 function create_containers() {
   BUILD_TYPE=$1
diff --git a/scripts/make_win32.cmd b/scripts/make_win32.cmd
index 1250ad68..95c61256 100644
--- a/scripts/make_win32.cmd
+++ b/scripts/make_win32.cmd
@@ -5,6 +5,9 @@ set ARG2=%~2
 
 pushd "%~dp0%"
   call setup_msys2.cmd "%ARG1%" "%ARG2%"
-
+  if exist "cleanup.cmd" (
+    call cleanup.cmd "x86_64" "%ARG1%" "%ARG2%" 1 0
+    del cleanup.*
+  )
   call mingw64 -no-start ./make_common.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 || exit 1
 popd