Skip to content

Commit 5044ca6

Browse files
committed
ci: add vcruntime140_1.dll
does not exist on win10 by default
1 parent ec4fb2b commit 5044ca6

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,6 @@ jobs:
441441
TARGET_OS: windows-desktop
442442
VCDIR: '/tmp/winsysroot/msvcrt-dev'
443443
WINDOWSSDKDIR: '/tmp/winsysroot/winsdk'
444-
VCVER: '14.27.29110'
445-
WINSDKVER: '10.0.19041.0'
446444
strategy:
447445
fail-fast: false
448446
matrix:
@@ -469,7 +467,7 @@ jobs:
469467
uses: actions/cache@v2
470468
with:
471469
path: /tmp/winsysroot
472-
key: sysroot-${{ env.TARGET_OS }}${{ env.WINSDKVER }}-vc${{ env.VCVER }}
470+
key: sysroot-${{ env.TARGET_OS }}${{ secrets.WINSDKVER }}-vc${{ secrets.VCVER }}
473471
- name: Create Build Environment
474472
shell: bash
475473
env:
@@ -522,6 +520,11 @@ jobs:
522520
working-directory: mdk
523521
run: |
524522
../ci-after-build.sh
523+
if [ -f $VCDIR/bin/x64/vcruntime140_1.dll ]; then
524+
mkdir -p mdk-sdk/bin/x64
525+
cp $VCDIR/bin/x64/vcruntime140_1.dll mdk-sdk/bin/x64
526+
7z a mdk-sdk-*.7z mdk-sdk/bin/x64/vcruntime140_1.dll
527+
fi
525528
mv mdk-sdk-*.7z ..
526529
- name: Archieve SDK
527530
uses: actions/upload-artifact@v2
@@ -544,8 +547,6 @@ jobs:
544547
TARGET_OS: uwp
545548
VCDIR: '/tmp/winsysroot/msvcrt-dev'
546549
WINDOWSSDKDIR: '/tmp/winsysroot/winsdk'
547-
VCVER: '14.27.29110'
548-
WINSDKVER: '10.0.19041.0'
549550
steps:
550551
- uses: actions/checkout@v2
551552
- name: Checkout source
@@ -567,7 +568,7 @@ jobs:
567568
uses: actions/cache@v2
568569
with:
569570
path: /tmp/winsysroot
570-
key: sysroot-${{ env.TARGET_OS }}${{ env.WINSDKVER }}-vc${{ env.VCVER }}
571+
key: sysroot-${{ env.TARGET_OS }}${{ secrets.WINSDKVER }}-vc${{ secrets.VCVER }}
571572
- name: Create Build Environment
572573
shell: bash
573574
env:

README.WinRT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If ffmpeg any module is not set, it's searched in the following order
2323
SDK is built by clang-cl 12.0 + lld with
2424
- FFmpeg: https://sourceforge.net/projects/avbuild/files/windows-store/ffmpeg-master-windows-store-clang-static-lite.tar.xz/download
2525
- Windows SDK 10.0.19041.0
26-
- MSVC CRT 14.26.28801
26+
- MSVC CRT 14.28.29333
2727

2828
### Use in Visual Studio
2929
#### Install via NuGet (Recommended)

README.Windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If ffmpeg any module is not set, it's searched in the following order
2323
SDK is built by clang-cl 12.0 + lld with
2424
- FFmpeg: https://sourceforge.net/projects/avbuild/files/windows-desktop/ffmpeg-master-windows-desktop-clang-static-lite.tar.xz/download
2525
- Windows SDK 10.0.19041.0
26-
- MSVC CRT 14.26.28801
26+
- MSVC CRT 14.28.29333
2727

2828
SDK can be used by any C or C++11 compiler, e.g. vs2015, vs2017, mingw g++, clang
2929

0 commit comments

Comments
 (0)