MSYS: Add support for UCRT64 and CLANG64 (#7360)

#changelog #mingw

Author: donarturo11

scripts/dev/download_libs.sh

@@ -135,18 +135,15 @@ EOF
             exit 1
         fi
     elif [ "$PLATFORM" == "msys2" ]; then
-        if [ "$MSYSTEM" == "MINGW64" ]; then 
-            ARCH=64
-        elif [ "$MSYSTEM" == "MINGW32" ]; then 
-            ARCH=32
-        else
-            cat << EOF
-This MSYS2 variant ($MSYSTEM) is not recognized.
-Check if you are running a MINGW32 or MINGW64 shell.
-Assuming 32bits version for now...
-EOF
-            ARCH=32
-        fi 
+        if [ "$MSYSTEM" == "MINGW64" ]; then
+            ARCH=mingw64
+        elif [ "$MSYSTEM" == "MINGW32" ]; then
+            ARCH=mingw32
+        elif [ "$MSYSTEM" == "UCRT64" ]; then
+            ARCH=ucrt64
+        elif [ "$MSYSTEM" == "CLANG64" ]; then
+            ARCH=clang64
+        fi
     fi
 fi
 
@@ -158,7 +155,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIR"
 
 if [ "$PLATFORM" == "msys2" ]; then
-    PKGS="openFrameworksLibs_${VER}_${PLATFORM}_mingw${ARCH}.zip"
+    PKGS="openFrameworksLibs_${VER}_${PLATFORM}_${ARCH}.zip"
 elif [ "$ARCH" == "" ] && [ "$PLATFORM" == "vs" ]; then
     PKGS="openFrameworksLibs_${VER}_${PLATFORM}_64_1.zip \
           openFrameworksLibs_${VER}_${PLATFORM}_64_2.zip \

scripts/msys2/compileOF.sh

@@ -17,13 +17,6 @@ while getopts tj: opt ; do
 	esac
 done
 
-if [ "${MSYSTEM:0:5}" != "MINGW" ]
-then
-	echo "This is not a MINGW(32|64) shell!"
-	echo "Please launch compileOF.sh from a MINGW(32|64) shell."
-	exit 1
-fi
-
 cd ${SCRIPTPATH}/../../libs/openFrameworksCompiled/project
 
 if [ -v CI ]; then