diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c0efe59f..8e7625f1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,9 +15,9 @@ jobs: - os: ubuntu-16.04 # We are using an old version of ubuntu to have an old libc version (forward compatibility exist but not backward) runtime: linux-x64 artifact: linux - # - os: windows-latest - # runtime: win-x64 - # artifact: windows + - os: windows-latest + runtime: win-x64 + artifact: windows - os: macOS-latest runtime: osx-x64 artifact: macos @@ -37,6 +37,8 @@ jobs: elif [[ "${{runner.os}}" == "macOS" ]]; then brew install ffmpeg else + sudo add-apt-repository ppa:jonathonf/ffmpeg-4 + sudo apt-get upgrade sudo apt-get install -y libavutil-dev libavcodec-dev libavformat-dev fi - name: Build the app diff --git a/.gitignore b/.gitignore index 649585e9..f2702d13 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ Kyoo/Transcoder/Kyoo.Transcoder.lib Kyoo/Transcoder/Kyoo.Transcoder.pdb Kyoo/Transcoder/Kyoo.Transcoder.exp +libtranscoder.so +libtranscoder.dylib +transcoder.dll docs/ diff --git a/Kyoo/Kyoo.csproj b/Kyoo/Kyoo.csproj index 2d581f29..63b3b491 100644 --- a/Kyoo/Kyoo.csproj +++ b/Kyoo/Kyoo.csproj @@ -116,13 +116,14 @@ + Command="(if not exist build mkdir build) %26%26 cd build %26%26 cmake .. -G 'NMake Makefiles' %26%26 nmake" /> PreserveNewest + false