From b6c020d35d509ca984170cb0b456ee470a1e9523 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Tue, 9 Jul 2024 11:42:30 -0500 Subject: [PATCH] updated build system --- scripts/info.cmd | 3 ++- scripts/make_package.cmd | 3 ++- scripts/make_win32.cmd | 7 ++++--- scripts/setup_msys2.cmd | 5 +++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scripts/info.cmd b/scripts/info.cmd index 7ca3fcc5..a560b9d8 100644 --- a/scripts/info.cmd +++ b/scripts/info.cmd @@ -4,8 +4,9 @@ setlocal set ARG1=%~1 set ARG2=%~2 +set ARG3=%~3 pushd "%~dp0%" - call mingw64 -no-start ./info.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 + call mingw64 -no-start ./info.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 popd diff --git a/scripts/make_package.cmd b/scripts/make_package.cmd index 179caf8c..32478fb7 100644 --- a/scripts/make_package.cmd +++ b/scripts/make_package.cmd @@ -5,7 +5,8 @@ setlocal set DEST=%~1 set ARG1=%~2 set ARG2=%~3 +set ARG3=%~4 pushd "%~dp0%" - call mingw64 -no-start ./make_package.sh "%DEST%" "x86_64" "%ARG1%" "%ARG2%" 1 0 || exit 1 + call mingw64 -no-start ./make_package.sh "%DEST%" "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1 popd diff --git a/scripts/make_win32.cmd b/scripts/make_win32.cmd index e1010579..73f10f42 100644 --- a/scripts/make_win32.cmd +++ b/scripts/make_win32.cmd @@ -4,12 +4,13 @@ setlocal set ARG1=%~1 set ARG2=%~2 +set ARG3=%~3 pushd "%~dp0%" - call setup_msys2.cmd "%ARG1%" "%ARG2%" + call setup_msys2.cmd "%ARG1%" "%ARG2%" "%ARG3%" if exist "cleanup.cmd" ( - call cleanup.cmd "x86_64" "%ARG1%" "%ARG2%" 1 0 + call cleanup.cmd "%ARG1%" "%ARG2%" "%ARG3%" 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 "%ARG1%" "%ARG2%" "%ARG3%" 1 0 || exit 1 popd diff --git a/scripts/setup_msys2.cmd b/scripts/setup_msys2.cmd index 0d1d1580..ce3c4666 100644 --- a/scripts/setup_msys2.cmd +++ b/scripts/setup_msys2.cmd @@ -4,8 +4,9 @@ setlocal set ARG1=%~1 set ARG2=%~2 +set ARG3=%~3 pushd "%~dp0%" - call mingw64 -no-start ./setup_msys2.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 - call mingw64 -no-start ./setup_msys2.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 + call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 + call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "%ARG2%" "%ARG3%" 1 0 popd