From c05b4d9fdde314f16b220fd479ebe88b01f390d7 Mon Sep 17 00:00:00 2001 From: Daniel Stankewitz Date: Sun, 20 Mar 2022 17:16:58 +0100 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3fcb8c7..bc959d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,26 +22,16 @@ jobs: echo CL_EXEC="%_cl_path%" echo WSL_CL_EXEC=`wslpath -u "$CL_EXEC"` echo WSL_CL_PATH=`dirname "$WSL_CL_EXEC"` - echo export PATH=$PATH:$WSL_CL_PATH - echo export DevEnvDir="%DevEnvDir% " - rem ExtensionSdkDir - rem FSHARPINSTALLDIR - rem Framework40Version - rem FrameworkDIR32 - rem FrameworkDir - rem FrameworkVersion - rem FrameworkVersion32 - echo export INCLUDE="%INCLUDE% " - echo export LIB="%LIB% " - echo export LIBPATH="%LIBPATH% " - echo export VCINSTALLDIR="%VCINSTALLDIR% " - echo export VSINSTALLDIR="%VSINSTALLDIR% " - echo export VisualStudioVersion="%VisualStudioVersion% " - rem echo export WindowsSDK_ExecutablePath_x64=%WindowsSDK_ExecutablePath_x64% - rem echo export WindowsSDK_ExecutablePath_x86=%WindowsSDK_ExecutablePath_x86% - rem echo export WindowsSdkDir=%WindowsSdkDir% - echo export WSLcross=true - echo export WSLENV=$WSLENV:INCLUDE/w:LIB/w:LIBPATH/w + PATH=$PATH:$WSL_CL_PATH + export DevEnvDir="%DevEnvDir% " + export INCLUDE="%INCLUDE% " + export LIB="%LIB% " + export LIBPATH="%LIBPATH% " + export VCINSTALLDIR="%VCINSTALLDIR% " + export VSINSTALLDIR="%VSINSTALLDIR% " + export VisualStudioVersion="%VisualStudioVersion% " + export WSLcross=true + export WSLENV=$WSLENV:INCLUDE/w:LIB/w:LIBPATH/w - name: Set up WSL uses: Vampire/setup-wsl@v1.2.0 - name: Build FFmpeg