Skip to content

MSYS: Add support for UCRT64 and CLANG64 #7360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ofTheo merged 1 commit into from
Mar 7, 2023
Merged

MSYS: Add support for UCRT64 and CLANG64 #7360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 10 additions & 13 deletions scripts/dev/download_libs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 \
Expand Down
7 changes: 0 additions & 7 deletions scripts/msys2/compileOF.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down