From c18c870a1b7f62c56b021012dd83212ce9b9ac52 Mon Sep 17 00:00:00 2001 From: wxf Date: Sat, 14 Aug 2021 15:01:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20MSVC=20CI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/msvc-ci.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/msvc-ci.yml diff --git a/.github/workflows/msvc-ci.yml b/.github/workflows/msvc-ci.yml new file mode 100644 index 00000000..ba1b91d9 --- /dev/null +++ b/.github/workflows/msvc-ci.yml @@ -0,0 +1,30 @@ +name: MSVC C/C++ CI + +on: [push] + +jobs: + build: + runs-on: windows-2019 + + steps: + - uses: actions/checkout@v1 + with: + submodules: 'recursive' + fetch-depth: 1 + + - name: 配置 vcpkg + uses: lukka/run-vcpkg@v7 + with: + vcpkgDirectory: '${{github.workspace}}/vcpkg' + vcpkgTriplet: x64-windows-static + # 2021.05.12 + vcpkgGitCommitId: '5568f110b509a9fd90711978a7cb76bae75bb092' + vcpkgArguments: 'openssl libsrtp' + + - name: 编译 + uses: lukka/run-cmake@main + with: + useVcpkgToolchainFile: true + buildDirectory: '${{github.workspace}}/build' + cmakeAppendedArgs: '-DCMAKE_ENABLE_WEBRTC:BOOL=ON' + cmakeBuildType: 'RelWithDebInfo' From a93bba95c19cb85cd7dd4a3c7740d57bc60c2abd Mon Sep 17 00:00:00 2001 From: wxf Date: Mon, 16 Aug 2021 11:25:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Toolkit=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8=20cmake=20=E6=9F=A5=E5=88=B0?= =?UTF-8?q?=E7=9A=84=20ssl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdpart/ZLToolKit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdpart/ZLToolKit b/3rdpart/ZLToolKit index 180f173c..935ae940 160000 --- a/3rdpart/ZLToolKit +++ b/3rdpart/ZLToolKit @@ -1 +1 @@ -Subproject commit 180f173c10cb350cf13d5108bb9cd3c3f555e055 +Subproject commit 935ae9406bc5569e916dba604ec3ce5f6cf84bcf