mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-02 13:58:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: no find vcruntime dll

Browse source 
Close #274
This commit is contained in:
rankun 2020-09-18 12:58:03 +08:00
commit 57ab6cfed3
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.github/workflows/windows.yml vendored
View file

@ -38,6 +38,7 @@ jobs:
env: env:
target-name: QtScrcpy target-name: QtScrcpy
vcvarsall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' vcvarsall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
vcinstall-path: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC'
qt-install-path: ${{ github.workspace }}/${{ matrix.qt-ver }} qt-install-path: ${{ github.workspace }}/${{ matrix.qt-ver }}
plantform-des: win plantform-des: win
# 步骤 # 步骤
@ -84,6 +85,8 @@ jobs:
- name: Package - name: Package
id: package id: package
env: env:
ENV_VCVARSALL: ${{ env.vcvarsall-path }}
ENV_VCINSTALL: ${{ env.vcinstall-path }}
ENV_QT_PATH: ${{ env.qt-install-path }} ENV_QT_PATH: ${{ env.qt-install-path }}
publish_name: ${{ env.target-name }}-${{ env.plantform-des }}-${{ matrix.msvc-arch }}-${{ steps.get-version.outputs.version }} publish_name: ${{ env.target-name }}-${{ env.plantform-des }}-${{ matrix.msvc-arch }}-${{ steps.get-version.outputs.version }}
run: | run: |

12
ci/win/publish_for_win.bat
View file

@ -7,9 +7,14 @@ echo check ENV
echo --------------------------------------------------------------- echo ---------------------------------------------------------------
:: 从环境变量获取必要参数 :: 从环境变量获取必要参数
:: example: D:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvarsall.bat
set vcvarsall="%ENV_VCVARSALL%"
:: 设置了VCINSTALLDIR，windeployqt会自动copy vcruntime dll
set VCINSTALLDIR="%ENV_VCINSTALL%"
:: 例如 d:\a\QtScrcpy\Qt\5.12.7 :: 例如 d:\a\QtScrcpy\Qt\5.12.7
set qt_msvc_path="%ENV_QT_PATH%" set qt_msvc_path="%ENV_QT_PATH%"
echo ENV_VCVARSALL %ENV_VCVARSALL%
echo ENV_QT_PATH %ENV_QT_PATH% echo ENV_QT_PATH %ENV_QT_PATH%
:: 获取脚本绝对路径 :: 获取脚本绝对路径
@ -51,6 +56,13 @@ if /i %cpu_mode% == x86 (
) )
set PATH=%qt_msvc_path%;%PATH% set PATH=%qt_msvc_path%;%PATH%
:: 注册vc环境(注册以后，windeployqt会把vc_redist复制过来（vcruntime安装包）)
:: if /i %cpu_mode% == x86 (
:: call %vcvarsall% %cpu_mode%
:: ) else (
:: call %vcvarsall% %cpu_mode%
:: )
if exist %publish_path% ( if exist %publish_path% (
rmdir /s/q %publish_path% rmdir /s/q %publish_path%
) )