From 7cdb015392572ca940be57d21b1cf92068cd8c97 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sat, 24 Aug 2024 10:25:44 -0500
Subject: [PATCH] updated build system

---
 docker/x86_64/mingw64 |  5 ++---
 scripts/env.sh        | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64
index cfaa53ca..60e79d4d 100644
--- a/docker/x86_64/mingw64
+++ b/docker/x86_64/mingw64
@@ -1,4 +1,3 @@
-# comment
 FROM alpine:3.20.2
 
 RUN apk update
@@ -92,8 +91,8 @@ RUN echo -e \
   "windres = '${MY_MINGW_PREFIX}-windres'\n"\
   "exe_wrapper = 'wine64'\n"\
   "[properties]\n"\
-  "c_args = []\n"\
-  "c_link_args = []\n"\
+  "c_args = [-I${MY_MINGW_DIR}/include]\n"\
+  "c_link_args = [-L${MY_MINGW_DIR}/lib,-L${MY_MINGW_DIR}/lib64]\n"\
   "[host_machine]\n"\
   "cpu = 'x86_64'\n"\
   "cpu_family = 'x86_64'\n"\
diff --git a/scripts/env.sh b/scripts/env.sh
index be154fa5..9f87226e 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -160,22 +160,6 @@ else
   PROJECT_REQUIRE_ALPINE=OFF
 fi
 
-if [ -f "${PROJECT_SOURCE_DIR}/cmake/versions.cmake" ]; then
-  VERSIONS=($(sed -e s/\ /=/g -e s/set\(//g -e s/\)//g "${PROJECT_SOURCE_DIR}/cmake/versions.cmake"))
-
-  PROJECT_MINGW64_DOCKER_BUILD_ARGS=()
-
-  for VERSION in "${VERSIONS[@]}"; do
-    LOOKUP_NAME=$(echo ${VERSION} | sed s/_VERSION.*// | sed s/GTEST/TESTING/g)
-    ENABLE_NAME=PROJECT_ENABLE_${LOOKUP_NAME}
-    if [ "${!ENABLE_NAME}" != "OFF" ]; then
-      PROJECT_MINGW64_DOCKER_BUILD_ARGS+=("--build-arg ${VERSION}")
-    fi
-  done
-
-  PROJECT_MINGW64_DOCKER_BUILD_ARGS=${PROJECT_MINGW64_DOCKER_BUILD_ARGS[*]}
-fi
-
 PROJECT_BUILD_DIR=${PROJECT_SOURCE_DIR}/build/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${PROJECT_LINK_TYPE}
 PROJECT_DIST_DIR=${PROJECT_SOURCE_DIR}/dist/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${PROJECT_LINK_TYPE}
 
@@ -232,6 +216,22 @@ if [ "${PROJECT_ENABLE_LIBDSM}" == "ON" ]; then
   fi
 fi
 
+if [ -f "${PROJECT_SOURCE_DIR}/cmake/versions.cmake" ]; then
+  VERSIONS=($(sed -e s/\ /=/g -e s/set\(//g -e s/\)//g "${PROJECT_SOURCE_DIR}/cmake/versions.cmake"))
+
+  PROJECT_MINGW64_DOCKER_BUILD_ARGS=()
+
+  for VERSION in "${VERSIONS[@]}"; do
+    LOOKUP_NAME=$(echo ${VERSION} | sed s/_VERSION.*// | sed s/GTEST/TESTING/g)
+    ENABLE_NAME=PROJECT_ENABLE_${LOOKUP_NAME}
+    if [ "${!ENABLE_NAME}" != "OFF" ]; then
+      PROJECT_MINGW64_DOCKER_BUILD_ARGS+=("--build-arg ${VERSION}")
+    fi
+  done
+
+  PROJECT_MINGW64_DOCKER_BUILD_ARGS=${PROJECT_MINGW64_DOCKER_BUILD_ARGS[*]}
+fi
+
 PROJECT_CMAKE_OPTS="-DPROJECT_3RD_PARTY_DIR=${PROJECT_3RD_PARTY_DIR} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_ARCH=${PROJECT_BUILD_ARCH} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_BUILD_DIR=${PROJECT_BUILD_DIR} ${PROJECT_CMAKE_OPTS}"