From b3e67457a396a9d5321af5fd68b4baa2de72b4af Mon Sep 17 00:00:00 2001
From: rankun <rankun@bytedance.com>
Date: Thu, 20 Feb 2020 13:57:51 +0800
Subject: [PATCH] 1

---
 .github/workflows/windows.yml |  3 +++
 ci/win/build_for_win.bat      | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 19302f7..d911a55 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -69,6 +69,9 @@ jobs:
         shell: cmd
         env:
           vc_arch: ${{ matrix.msvc_arch }}
+          ENV_VCVARSALL: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat'
+          ENV_QT_MSVC: 'd:\a\QtScrcpy\Qt\5.12.7'
+          ENV_BUILD_DIR: '../build-win'
         run: |
           call "ci\win\build_for_win.bat" release %vc_arch%
       # tag 打包
diff --git a/ci/win/build_for_win.bat b/ci/win/build_for_win.bat
index eaf04f4..9c247de 100644
--- a/ci/win/build_for_win.bat
+++ b/ci/win/build_for_win.bat
@@ -1,7 +1,8 @@
 @echo off
-set vcvarsall="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
-set qt_msvc_path="d:\a\QtScrcpy\Qt\5.12.7\"
-set build_path_name="../build-win"
+:: 从环境变量获取必要参数
+set vcvarsall=%ENV_VCVARSALL%
+set qt_msvc_path=%ENV_QT_MSVC%
+set build_path_name=%ENV_BUILD_DIR%
 
 :: 获取脚本绝对路径
 set script_path=%~dp0
@@ -46,9 +47,9 @@ if /i %debug_mode% == "true" (
 
 :: 环境变量设置
 if /i %cpu_mode% == x86 (
-    set qt_msvc_path=%qt_msvc_path%msvc2017\bin
+    set qt_msvc_path=%qt_msvc_path%\msvc2017\bin
 ) else (
-    set qt_msvc_path=%qt_msvc_path%msvc2017_64\bin
+    set qt_msvc_path=%qt_msvc_path%\msvc2017_64\bin
 )
 
 set PATH=%qt_msvc_path%;%PATH%
@@ -87,7 +88,6 @@ if /i %debug_mode% == "true" (
 
 :: qmake ../../all.pro -spec win32-msvc "CONFIG+=debug" "CONFIG+=qml_debug"
 qmake ../../all.pro %qmake_params%
-:: qmake ../../all.pro
 if not %errorlevel%==0 (
     echo "qmake failed"
     goto return