From 643078c0ae1d2c17d618d0a65ef5f9eb09bce189 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 18 Aug 2025 11:32:48 +0200 Subject: [PATCH] merge some lines --- .github/workflows/windows.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index af05bb92c8..8216670804 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -858,16 +858,10 @@ jobs: MSDK_BINU="$MSDK_ROOTU/bin/$MSDK_VER/$MSVC_HOST" cflags+=" -external:W0" cflags+=" -external:I$MSVC_ROOTW/include" - cflags+=" -external:I$MSDK_INCW/shared" - cflags+=" -external:I$MSDK_INCW/ucrt" - cflags+=" -external:I$MSDK_INCW/um" - cflags+=" -external:I$MSDK_INCW/km" - rcflags+=" -I$MSDK_INCW/shared" - rcflags+=" -I$MSDK_INCW/um" + cflags+=" -external:I$MSDK_INCW/shared -external:I$MSDK_INCW/ucrt -external:I$MSDK_INCW/um -external:I$MSDK_INCW/km" + rcflags+=" -I$MSDK_INCW/shared -I$MSDK_INCW/um" ldflags+=" -libpath:$MSVC_ROOTW/lib/$MATRIX_ARCH" - ldflags+=" -libpath:$MSDK_LIBW/ucrt/$MATRIX_ARCH" - ldflags+=" -libpath:$MSDK_LIBW/um/$MATRIX_ARCH" - ldflags+=" -libpath:$MSDK_LIBW/km/$MATRIX_ARCH" + ldflags+=" -libpath:$MSDK_LIBW/ucrt/$MATRIX_ARCH -libpath:$MSDK_LIBW/um/$MATRIX_ARCH -libpath:$MSDK_LIBW/km/$MATRIX_ARCH" options+=" -DCMAKE_RC_COMPILER=$MSDK_BINU/rc.exe" options+=" -DCMAKE_MT=$MSDK_BINU/mt.exe" options+=" -DCMAKE_C_COMPILER=$MSVC_BINU/cl.exe"