From df740fec5a71360d898ceaeaf1fd67c9edb5058d Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Mon, 10 Jul 2023 15:58:14 +0200 Subject: [PATCH] (Windows) Another try to avoid a filesystem race condition for the MinGW dependency setup script --- tools/Windows_dependencies_setup_MinGW.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tools/Windows_dependencies_setup_MinGW.sh b/tools/Windows_dependencies_setup_MinGW.sh index 351e73f31..a20e7d73a 100644 --- a/tools/Windows_dependencies_setup_MinGW.sh +++ b/tools/Windows_dependencies_setup_MinGW.sh @@ -25,14 +25,14 @@ rm -rf curl* curl -O https://curl.se/windows/dl-8.1.2_3/curl-8.1.2_3-win64-mingw.zip unzip curl-8.1.2_3-win64-mingw.zip -# Needed due to some kind of file system race condition that sometimes occurs on Windows. -sleep 2 - if [ ! -d curl-8.1.2_3-win64-mingw ]; then echo "curl directory is missing, aborting." exit fi +# Needed due to some kind of file system race condition that sometimes occurs on Windows. +sleep 3 + mv curl-8.1.2_3-win64-mingw curl cp -p curl/bin/libcurl-x64.dll .. @@ -43,13 +43,13 @@ rm -rf glew* curl -LO https://sourceforge.net/projects/glew/files/glew/2.1.0/glew-2.1.0.zip unzip glew-2.1.0.zip -sleep 2 - if [ ! -d glew-2.1.0 ]; then echo "GLEW directory is missing, aborting." exit fi +sleep 3 + mv glew-2.1.0 glew echo -e "\nSetting up FreeType" @@ -129,14 +129,13 @@ curl -O https://libsdl.org/release/SDL2-devel-2.28.1-mingw.tar.gz tar xvzf SDL2-devel-2.28.1-mingw.tar.gz -# Needed due to some kind of file system race condition that sometimes occurs on Windows. -sleep 2 - if [ ! -d SDL2-2.28.1 ]; then echo "SDL directory is missing, aborting." exit fi +sleep 3 + mv SDL2-2.28.1 SDL2 mv SDL2/x86_64-w64-mingw32/include/SDL2 SDL2/ @@ -150,13 +149,13 @@ rm -rf ffmpeg* curl -LO https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2023-05-31-12-47/ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0.zip unzip ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0.zip -sleep 2 - if [ ! -d ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0 ]; then echo "FFmpeg directory is missing, aborting." exit fi +sleep 3 + mv ffmpeg-n6.0-22-g549430e14d-win64-gpl-shared-6.0 ffmpeg cp -p ffmpeg/bin/avcodec-60.dll ..