Merge b9f8b1aa658e4af32c0206f4603718857d2221e7 into fc63532fef3b75d95759d93dab2b5622d5a12b6d

This commit is contained in:
Sheikh 2025-03-08 11:23:24 -08:00 committed by GitHub
commit 039b32da79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 11 deletions

1
.gitignore vendored
View File

@ -16,4 +16,5 @@
tests/_test*
build
.build
.deps
CMakeSettings.json

View File

@ -74,7 +74,7 @@ elif [[ "$(uname)" == "Linux" ]] ; then
cpu=x64
elif [[ "$(uname)" =~ "Darwin" ]] ; then
is_macos=1
if [[ $(uname -m) == "arm64" ]]; then
if [[ "$(uname -m)" == "arm64" ]] ; then
cpu=arm64
else
cpu=x64
@ -384,20 +384,24 @@ if [ ! -f "$pwd/.build/$file_skia_dir" ] ; then
else
skia_dir="$HOME/deps/$possible_skia_dir_name"
fi
# Set default location if not found
if [ ! -d "$skia_dir" ] ; then
echo ""
echo "Skia directory wasn't found."
echo ""
skia_dir="$pwd/.deps/$possible_skia_dir_name"
echo "Select Skia directory to create [$skia_dir]? "
if [ ! $auto ] ; then
read skia_dir_read
if [ "$skia_dir_read" != "" ] ; then
skia_dir="$skia_dir_read"
if [ ! -d "$skia_dir" ] ; then
echo ""
echo "Skia directory wasn't found."
echo ""
echo "Select Skia directory to create [$skia_dir]? "
if [ ! $auto ] ; then
read skia_dir_read
if [ "$skia_dir_read" != "" ] ; then
skia_dir="$skia_dir_read"
fi
fi
mkdir -p $skia_dir || exit 1
fi
mkdir -p $skia_dir || exit 1
fi
echo $skia_dir > "$pwd/.build/$file_skia_dir"
fi