From 27e5db45d6d9bd7349745c57a9c9352f44c75228 Mon Sep 17 00:00:00 2001 From: amass <168062547@qq.com> Date: Thu, 14 Nov 2024 11:20:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E5=B0=8F=E6=89=93=E5=8C=85=E4=BD=93?= =?UTF-8?q?=E7=A7=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- resources/build.ps1 | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d3a1663..3b487a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.16) -project(AntiClipSettings VERSION 1.4 LANGUAGES C CXX) +project(AntiClipSettings VERSION 1.5 LANGUAGES C CXX) set(APPLICATION_NAME "视觉防夹设备上位机工具") set(CMAKE_CXX_STANDARD 17) diff --git a/resources/build.ps1 b/resources/build.ps1 index 42d1c51..8a0b5de 100644 --- a/resources/build.ps1 +++ b/resources/build.ps1 @@ -48,6 +48,13 @@ function Deploy() { New-Item $deployPath -ItemType Directory Copy-Item $buildPath\AntiClipSettings.exe $deployPath\AntiClipSettings.exe & $qtHome\bin\windeployqt.exe $deployPath\AntiClipSettings.exe --qmldir=$qtHome\qml + Remove-Item -Path $deployPath\d3dcompiler_47.dll -Force + Remove-Item -Path $deployPath\Qt5RemoteObjects.dll -Force + Remove-Item -Path $deployPath\Qt5QuickTest.dll -Force + Remove-Item -Path $deployPath\translations -Recurse -Force # 暂时不需要翻译文件 + Remove-Item -Path $deployPath\qmltooling -Recurse -Force + Remove-Item -Path $deployPath\QtTest -Recurse -Force + Remove-Item -Path $deployPath\QtGraphicalEffects -Recurse -Force # $modules = "QmlCore" @@ -71,7 +78,8 @@ function Deploy() { Copy-Item -Path $boostRoot\lib\boost_$boost-vc143-mt-x64-1_83.dll -Destination $deployPath } - $ffmpegs = "avcodec-60", "avdevice-60", "avfilter-9", "avformat-60", "avutil-58", "postproc-57", "swresample-4", "swscale-7" + # 暂时不需要 avfilter-9、avformat-60 + $ffmpegs = "avcodec-60", "avdevice-60", "avutil-58", "postproc-57", "swresample-4", "swscale-7" foreach ($ffmpeg in $ffmpegs) { Copy-Item -Path $ffmpegRoot\bin\$ffmpeg.dll -Destination $deployPath }