updated build system
All checks were successful
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
All checks were successful
BlockStorage/repertory_linux_builds/pipeline/head This commit looks good
This commit is contained in:
parent
e73dd52973
commit
462365dc97
@ -111,16 +111,6 @@ if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; th
|
|||||||
PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/opengl*.dll)
|
PROJECT_MINGW64_COPY_DEPENDENCIES+=(/mingw64/bin/opengl*.dll)
|
||||||
fi
|
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
|
for PROJECT_DEPENDENCY in "${PROJECT_MINGW64_COPY_DEPENDENCIES[@]}"; do
|
||||||
rsync -av --progress ${PROJECT_DEPENDENCY} "${PROJECT_DIST_DIR}/"
|
rsync -av --progress ${PROJECT_DEPENDENCY} "${PROJECT_DIST_DIR}/"
|
||||||
done
|
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}/"
|
rsync -av --progress ${PROJECT_EXTERNAL_BUILD_ROOT}/lib/gcc_x64_dll/*.dll "${PROJECT_DIST_DIR}/"
|
||||||
fi
|
fi
|
||||||
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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user