diff --git a/.github/workflows/x265.yml b/.github/workflows/x265.yml index edb0eb6..c811a7d 100644 --- a/.github/workflows/x265.yml +++ b/.github/workflows/x265.yml @@ -46,7 +46,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: x265_12bit - path: dist/x265_12bit.tgz + path: dist/x265_12bit.lib libx265-10: runs-on: windows-2019 @@ -92,23 +92,26 @@ jobs: git config --global core.autocrlf false git config --global core.eol lf git clone -b Release_3.5 https://github.com/videolan/x265.git x265 - - name: Set up artifacts + - name: Set up dependant libs uses: actions/download-artifact@v3 with: - path: build_artifacts + path: build - name: Build X265 (10 bit) shell: cmd run: | call "${{ env.vsPath }}VC\Auxiliary\Build\vcvars64.bat" - md build dist + md dist cd x265/build/vc15-x86_64 md work cd work - cmake -G "Visual Studio 15 Win64" ../../../source -DCMAKE_INSTALL_PREFIX=$BUILD -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="x265_10bit.lib;x265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON - - cmake -G "Visual Studio 16 2019" ..\..\..\source -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF + cmake -G "Visual Studio 16 2019" ..\..\..\source -DCMAKE_INSTALL_PREFIX=..\..\..\..\build -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DEXTRA_LIB="libx265_10bit.lib;libx265_12bit.lib" -DLINKED_10BIT=ON -DLINKED_12BIT=ON MSBuild.exe /property:Configuration="${{ env.winConfig }}" x265-static.vcxproj - move ${{ env.winConfig }}\x265-static.lib dist\x265_10bit.lib + LIB.EXE /ignore:4006 /ignore:4221 /OUT:..\..\..\..\dist\x265.lib ${{ env.winConfig }}\x265-static.lib ..\..\..\..\build\libx265_10bit.lib ..\..\..\..\build\libx265_12bit.lib + cp x265.pc ..\..\..\..\build\lib\pkgconfig\x265.pc + cp x265_config.h ..\..\..\..\build\include + cp ..\..\..\source\x265.h ..\..\..\..\build\lib\include + cd ..\..\..\..\build + rem tgz - name: Publish artifact uses: actions/upload-artifact@v2 with: