From 086626824c0a3fa817a1085d3025dcc3dd9951b6 Mon Sep 17 00:00:00 2001 From: shengyu Date: Tue, 22 Sep 2020 21:03:54 +0800 Subject: [PATCH 1/2] fix: remove extra ';' semicolon --- QtScrcpy/device/controller/inputconvert/inputconvertbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertbase.h b/QtScrcpy/device/controller/inputconvert/inputconvertbase.h index 7cdde2ca0..f16c631b2 100644 --- a/QtScrcpy/device/controller/inputconvert/inputconvertbase.h +++ b/QtScrcpy/device/controller/inputconvert/inputconvertbase.h @@ -24,7 +24,7 @@ class InputConvertBase : public QObject virtual bool isCurrentCustomKeymap() { return false; - }; + } signals: void grabCursor(bool grab); From 999b289eca4f24155e6db0da10ab3f50912d4d34 Mon Sep 17 00:00:00 2001 From: rankun Date: Fri, 23 Oct 2020 13:57:56 +0800 Subject: [PATCH 2/2] fix: not found vcruntime140_1.dll --- ci/win/publish_for_win.bat | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ci/win/publish_for_win.bat b/ci/win/publish_for_win.bat index 050f3af17..bbf912ddc 100644 --- a/ci/win/publish_for_win.bat +++ b/ci/win/publish_for_win.bat @@ -11,7 +11,7 @@ echo --------------------------------------------------------------- set vcvarsall="%ENV_VCVARSALL%" :: 例如 d:\a\QtScrcpy\Qt\5.12.7 set qt_msvc_path="%ENV_QT_PATH%" -:: 设置了VCINSTALLDIR，windeployqt会自动copy vcruntime dll +:: 设置了VCINSTALLDIR，windeployqt会自动copy vc_redist.x**.exe(vcruntime dll安装包) :: set VCINSTALLDIR="%ENV_VCINSTALL%" echo ENV_VCVARSALL %ENV_VCVARSALL% @@ -100,12 +100,17 @@ if /i %cpu_mode% == x86 ( ) :: copy vcruntime dll -cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\VCRUNTIME140.dll" %publish_path%\VCRUNTIME140.dll -cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-runtime-l1-1-0.dll" %publish_path%\api-ms-win-crt-runtime-l1-1-0.dll -cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-heap-l1-1-0.dll" %publish_path%\api-ms-win-crt-heap-l1-1-0.dll -cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-math-l1-1-0.dll" %publish_path%\api-ms-win-crt-math-l1-1-0.dll -cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-stdio-l1-1-0.dll" %publish_path%\api-ms-win-crt-stdio-l1-1-0.dll -cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-locale-l1-1-0.dll" %publish_path%\api-ms-win-crt-locale-l1-1-0.dll +:: 只有在64位下需要这个 +if /i %cpu_mode% == x64 ( + cp "C:\Windows\System32\vcruntime140_1.dll" %publish_path%\vcruntime140_1.dll +) + +::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\VCRUNTIME140.dll" %publish_path%\VCRUNTIME140.dll +::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-runtime-l1-1-0.dll" %publish_path%\api-ms-win-crt-runtime-l1-1-0.dll +::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-heap-l1-1-0.dll" %publish_path%\api-ms-win-crt-heap-l1-1-0.dll +::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-math-l1-1-0.dll" %publish_path%\api-ms-win-crt-math-l1-1-0.dll +::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-stdio-l1-1-0.dll" %publish_path%\api-ms-win-crt-stdio-l1-1-0.dll +::cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\api-ms-win-crt-locale-l1-1-0.dll" %publish_path%\api-ms-win-crt-locale-l1-1-0.dll echo= echo=