updated build system

This commit is contained in:
Scott E. Graves 2024-06-07 11:36:15 -05:00
parent a5e29ed745
commit 50ae7ab558
2 changed files with 10 additions and 2 deletions

View File

@ -3,7 +3,12 @@
CURRENT_DIR=$(dirname "$0") CURRENT_DIR=$(dirname "$0")
CURRENT_DIR=$(realpath ${CURRENT_DIR}) 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() { function create_containers() {
BUILD_TYPE=$1 BUILD_TYPE=$1

View File

@ -5,6 +5,9 @@ set ARG2=%~2
pushd "%~dp0%" pushd "%~dp0%"
call setup_msys2.cmd "%ARG1%" "%ARG2%" 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 call mingw64 -no-start ./make_common.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 || exit 1
popd popd