From 32facdc2ff73dbd45a2f8a0c21784ca926e5ee4b Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Sun, 4 Aug 2024 11:02:17 -0500
Subject: [PATCH] updated build system

---
 CMakeLists.txt                  |  1 -
 cmake/libraries/libsodium.cmake | 10 +++++++---
 scripts/env.sh                  |  1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e727338..9269ca96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,7 +154,6 @@ endif()
       -DPROJECT_IS_ARM64=${PROJECT_IS_ARM64}
       -DPROJECT_IS_MINGW=${PROJECT_IS_MINGW}
       -DPROJECT_IS_MINGW_UNIX=${PROJECT_IS_MINGW_UNIX}
-      -DPROJECT_LINK_TYPE=${PROJECT_LINK_TYPE}
       -DPROJECT_MAJOR_VERSION=${PROJECT_MAJOR_VERSION}
       -DPROJECT_MINOR_VERSION=${PROJECT_MINOR_VERSION}
       -DPROJECT_NAME=${PROJECT_NAME}
diff --git a/cmake/libraries/libsodium.cmake b/cmake/libraries/libsodium.cmake
index 518b6032..ed7037dc 100644
--- a/cmake/libraries/libsodium.cmake
+++ b/cmake/libraries/libsodium.cmake
@@ -1,12 +1,16 @@
 if(PROJECT_ENABLE_LIBSODIUM)
   if(PROJECT_BUILD)
-    add_definitions(-DPROJECT_ENABLE_LIBSODIUM)
-
     pkg_check_modules(SODIUM libsodium=${LIBSODIUM_VERSION} REQUIRED)
 
+    add_definitions(-DPROJECT_ENABLE_LIBSODIUM)
+
     include_directories(BEFORE SYSTEM ${SODIUM_INCLUDE_DIRS})
 
-    link_libraries(${SODIUM_LINK_LIBRARIES})
+    if(PROJECT_IS_MINGW_UNIX AND PROJECT_STATIC_LINK)
+      link_libraries(/mingw64/lib/libsodium.a)
+    else()
+      link_libraries(${SODIUM_LIBRARIES})
+    endif()
   elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
     if(PROJECT_IS_MINGW)
       set(LIBSODIUM_TYPE mingw64)
diff --git a/scripts/env.sh b/scripts/env.sh
index a312cd75..75cfb19b 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -229,7 +229,6 @@ PROJECT_CMAKE_OPTS="-DPROJECT_IS_ALPINE=${PROJECT_IS_ALPINE} ${PROJECT_CMAKE_OPT
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_ARM64=${PROJECT_IS_ARM64} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_MINGW=${PROJECT_IS_MINGW} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_IS_MINGW_UNIX=${PROJECT_IS_MINGW_UNIX} ${PROJECT_CMAKE_OPTS}"
-PROJECT_CMAKE_OPTS="-DPROJECT_LINK_TYPE=${PROJECT_LINK_TYPE} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_MAJOR_VERSION=${PROJECT_MAJOR_VERSION} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_MINOR_VERSION=${PROJECT_MINOR_VERSION} ${PROJECT_CMAKE_OPTS}"
 PROJECT_CMAKE_OPTS="-DPROJECT_NAME=${PROJECT_NAME} ${PROJECT_CMAKE_OPTS}"