From 0520aa3d4097020881e6768bcd153967e8042da7 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 6 Jun 2024 14:24:28 -0500
Subject: [PATCH] fixes

---
 scripts/cleanup.cmd      | 2 +-
 scripts/docker_common.sh | 2 +-
 scripts/info.cmd         | 2 +-
 scripts/make_unix.sh     | 2 +-
 scripts/make_win32.cmd   | 2 +-
 scripts/setup_msys2.cmd  | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/cleanup.cmd b/scripts/cleanup.cmd
index 7010ca05..d25e11c5 100644
--- a/scripts/cleanup.cmd
+++ b/scripts/cleanup.cmd
@@ -4,5 +4,5 @@ set ARG1=%~1
 set ARG2=%~2
 
 pushd "%~dp0%"
-  call mingw64 -no-start ./cleanup.sh "%ARG1%" "x86_64" "%ARG2%" 1 0 
+  call mingw64 -no-start ./cleanup.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 
 popd
diff --git a/scripts/docker_common.sh b/scripts/docker_common.sh
index f3d406f2..d9f6f1ee 100755
--- a/scripts/docker_common.sh
+++ b/scripts/docker_common.sh
@@ -41,7 +41,7 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
     docker exec \
       ${DOCKER_CONTAINER} \
       /bin/bash -c \
-      "${SOURCE_DIR}/scripts/make_common.sh \"${PROJECT_CMAKE_BUILD_TYPE}\" \"${PROJECT_BUILD_ARCH}\" \"${PROJECT_BUILD_CLEAN}\" ${IS_MINGW} ${IS_UNIX}" || exit 1
+      "${SOURCE_DIR}/scripts/make_common.sh \"${PROJECT_BUILD_ARCH}\" \"${PROJECT_CMAKE_BUILD_TYPE}\" \"${PROJECT_BUILD_CLEAN}\" ${IS_MINGW} ${IS_UNIX}" || exit 1
   fi
 
   docker stop ${DOCKER_CONTAINER}
diff --git a/scripts/info.cmd b/scripts/info.cmd
index 14409292..fd23cc8d 100644
--- a/scripts/info.cmd
+++ b/scripts/info.cmd
@@ -4,6 +4,6 @@ set ARG1=%~1
 set ARG2=%~2
 
 pushd "%~dp0%"
-  call mingw64 -no-start ./info.sh "%ARG1%" "x86_64" "%ARG2%" 1 0 
+  call mingw64 -no-start ./info.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 
 popd
 
diff --git a/scripts/make_unix.sh b/scripts/make_unix.sh
index f3a1a66d..5796cada 100755
--- a/scripts/make_unix.sh
+++ b/scripts/make_unix.sh
@@ -12,5 +12,5 @@ if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
 
   . "${CURRENT_DIR}/docker_common.sh" || exit 1
 else
-  "${SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_ARCH}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
+  "${SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
 fi
diff --git a/scripts/make_win32.cmd b/scripts/make_win32.cmd
index 3853067b..1250ad68 100644
--- a/scripts/make_win32.cmd
+++ b/scripts/make_win32.cmd
@@ -6,5 +6,5 @@ set ARG2=%~2
 pushd "%~dp0%"
   call setup_msys2.cmd "%ARG1%" "%ARG2%"
 
-  call mingw64 -no-start ./make_common.sh "%ARG1%" "x86_64" "%ARG2%" 1 0 || exit 1
+  call mingw64 -no-start ./make_common.sh "x86_64" "%ARG1%" "%ARG2%" 1 0 || exit 1
 popd
diff --git a/scripts/setup_msys2.cmd b/scripts/setup_msys2.cmd
index 135a7b39..88d2c3d9 100644
--- a/scripts/setup_msys2.cmd
+++ b/scripts/setup_msys2.cmd
@@ -4,6 +4,6 @@ set ARG1=%~1
 set ARG2=%~2
 
 pushd "%~dp0%"
-  call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "x86_64" "%ARG2%" 1 0
-  call mingw64 -no-start ./setup_msys2.sh "%ARG1%" "x86_64" "%ARG2%" 1 0 
+  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 
 popd