From a9e8c0f22108002148e93d27a07144b28029fb35 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 17 Aug 2025 23:16:33 +0200 Subject: [PATCH] debug 1 --- .github/workflows/windows.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3ec1e2ed7c..d5f4c4317b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -844,18 +844,22 @@ jobs: # and makes it problematic to use from this script. [[ "$(uname -s)" = *'ARM64'* ]] && MSVC_HOST='arm64' || MSVC_HOST='x64' # x86 echo '-----------------------------------------' - /usr/bin/find '/c/Program Files/Microsoft Visual Studio' -type d + /usr/bin/find '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/tools/msvc' \( -name '*.exe' -o -name '*.h' -o -name '*.lib' \) echo '-----------------------------------------' - /usr/bin/find '/c/Program Files (x86)/Windows Kits' -type d + /usr/bin/find '/c/Program Files (x86)/Windows Kits/10' \( -name '*.exe' -o -name '*.h' -o -name '*.lib' \) echo '-----------------------------------------' MSVC_ROOTD="$(cygpath --dos "$PROGRAMFILES/Microsoft Visual Studio")" # to avoid spaces MSVC_ROOTU="$(/usr/bin/find "$(cygpath --unix "$MSVC_ROOTD/2022/Enterprise/vc/tools/msvc")" -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1)" MSVC_ROOTW="$(cygpath --windows "$MSVC_ROOTU")" MSVC_ROOTU="$(cygpath --unix "$MSVC_ROOTW")" + echo "MSVC_ROOTW:|$MSVC_ROOTW|" + echo "MSVC_ROOTU:|$MSVC_ROOTU|" MSVC_BINU="$MSVC_ROOTU/bin/Host$MSVC_HOST/$MATRIX_ARCH" + echo "MSVC_BINU:|$MSVC_BINU|" MSDK_ROOTW="$(cygpath --dos "$(printenv 'ProgramFiles(x86)')/Windows Kits")/10" MSDK_ROOTU="$(cygpath --unix "$MSDK_ROOTW")" MSDK_VER="$(basename "$(/usr/bin/find "$MSDK_ROOTU/lib" -mindepth 1 -maxdepth 1 -type d | sort | tail -n 1)")" + echo "MSDK_VER:|$MSDK_VER|" MSDK_LIBW="$MSDK_ROOTW/lib/$MSDK_VER" MSDK_INCU="$MSDK_ROOTU/include/$MSDK_VER" MSDK_BINU="$MSDK_ROOTU/bin/$MSDK_VER/$MSVC_HOST"