diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 252318c..6dea7d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,21 +18,7 @@ jobs: shell: cmd run: | call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" - echo #!/bin/bash > vars.sh - FOR /F "delims==" %%G IN ('where cl.exe') DO SET _cl_path=%%G >> vars.sh - echo CL_EXEC="%_cl_path%" >> vars.sh - echo WSL_CL_EXEC=`wslpath -u "$CL_EXEC"` >> vars.sh - echo WSL_CL_PATH=`dirname "$WSL_CL_EXEC"` >> vars.sh - echo export PATH=$PATH:$WSL_CL_PATH >> vars.sh - echo export DevEnvDir="%DevEnvDir% " >> vars.sh - echo export INCLUDE="%INCLUDE% " >> vars.sh - rem echo export LIB="%LIB% " >> vars.sh - rem echo export LIBPATH="%LIBPATH% " >> vars.sh - rem echo export VCINSTALLDIR="%VCINSTALLDIR% " >> vars.sh - rem echo export VSINSTALLDIR="%VSINSTALLDIR% " >> vars.sh - rem echo export VisualStudioVersion="%VisualStudioVersion% " >> vars.sh - rem echo export WSLcross=true >> vars.sh - rem echo export WSLENV=$WSLENV:INCLUDE/w:LIB/w:LIBPATH/w >> vars.sh + .github\workflows\SetupWSLcross.bat > vars.sh - name: Set up WSL uses: Vampire/setup-wsl@v1.2.0 with: @@ -41,8 +27,10 @@ jobs: - name: Build FFmpeg shell: wsl-bash {0} run: | - dos2unix vars.sh ; chmod +x vars.sh ; ./vars.sh + dos2unix vars.sh cat vars.sh + chmod +x vars.sh + ./vars.sh set #echo $ABC #echo $PATH