mirrors/QtScrcpy
0
0
Fork 0
mirror of https://github.com/barry-ran/QtScrcpy.git synced 2025-08-03 14:18:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #307 from barry-ran/dev

Browse source 
Dev
This commit is contained in:
Barry 2020-10-23 14:07:52 +08:00 • committed by GitHub
commit 0898cecf6c
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
QtScrcpy/device/controller/inputconvert/inputconvertbase.h
View file

@ -24,7 +24,7 @@ public:
virtual bool isCurrentCustomKeymap() virtual bool isCurrentCustomKeymap()
{ {
return false; return false;
}; }
signals: signals:
void grabCursor(bool grab); void grabCursor(bool grab);

19
ci/win/publish_for_win.bat
View file

@ -11,7 +11,7 @@ echo ---------------------------------------------------------------
set vcvarsall="%ENV_VCVARSALL%" set vcvarsall="%ENV_VCVARSALL%"
:: 例如 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%"
:: 设置了VCINSTALLDIR，windeployqt会自动copy vcruntime dll :: 设置了VCINSTALLDIR，windeployqt会自动copy vc_redist.x**.exe(vcruntime dll安装包)
:: set VCINSTALLDIR="%ENV_VCINSTALL%" :: set VCINSTALLDIR="%ENV_VCINSTALL%"
echo ENV_VCVARSALL %ENV_VCVARSALL% echo ENV_VCVARSALL %ENV_VCVARSALL%
@ -100,12 +100,17 @@ if /i %cpu_mode% == x86 (
) )
:: copy vcruntime dll :: copy vcruntime dll
cp "C:\Program Files (x86)\Microsoft Visual Studio\Installer\VCRUNTIME140.dll" %publish_path%\VCRUNTIME140.dll :: 只有在64位下需要这个
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 if /i %cpu_mode% == x64 (
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:\Windows\System32\vcruntime140_1.dll" %publish_path%\vcruntime140_1.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 ::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=
echo= echo=