From 462365dc976b9481d8841e30222ad9750c06b214 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Thu, 6 Jun 2024 18:22:05 -0500 Subject: [PATCH] updated build system --- scripts/copy_mingw64_deps.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/copy_mingw64_deps.sh b/scripts/copy_mingw64_deps.sh index 8b9c5be8..e28d030c 100755 --- a/scripts/copy_mingw64_deps.sh +++ b/scripts/copy_mingw64_deps.sh @@ -111,16 +111,6 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/opengl*.dll) fi - if [ "${PROJECT_ENABLE_WINFSP}" == "ON" ]; then - if [ "${PROJECT_BUILD_ARCH}" == "x86_64" ]; then - WINFSP_DLL_PART=x64 - fi - - if [ "${WINFSP_DLL_PART}" != "" ]; then - PROJECT_MINGW64_COPY_DEPENDENCIES+=(${PROJECT_3RD_PARTY_DIR}/winfsp-2.0/bin/winfsp-${WINFSP_DLL_PART}.dll) - fi - fi - for PROJECT_DEPENDENCY in "${PROJECT_MINGW64_COPY_DEPENDENCIES[@]}"; do rsync -av --progress ${PROJECT_DEPENDENCY} "${PROJECT_DIST_DIR}/" done @@ -131,3 +121,13 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/lib/gcc_x64_dll/*.dll "${PROJECT_DIST_DIR}/" fi fi + +if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_ENABLE_WINFSP}" == "ON" ]; then + if [ "${PROJECT_BUILD_ARCH}" == "x86_64" ]; then + WINFSP_DLL_PART=x64 + fi + + if [ "${WINFSP_DLL_PART}" != "" ]; then + PROJECT_MINGW64_COPY_DEPENDENCIES+=(${PROJECT_3RD_PARTY_DIR}/winfsp-2.0/bin/winfsp-${WINFSP_DLL_PART}.dll) + fi +fi