From 883c3500163264227d000c36b938f3cb226c5e31 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Mon, 25 Jul 2022 11:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E7=95=8C=E9=9D=A2=E6=96=87=E4=BB=B6=E5=88=B0=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build-qt/HGSolution/HGScanner/HGScanner.pro | 9 ++++++--- build.bat | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build-qt/HGSolution/HGScanner/HGScanner.pro b/build-qt/HGSolution/HGScanner/HGScanner.pro index 45fdeb74..a7c6a071 100644 --- a/build-qt/HGSolution/HGScanner/HGScanner.pro +++ b/build-qt/HGSolution/HGScanner/HGScanner.pro @@ -172,7 +172,8 @@ SOURCES += \ ../../../app/scanner/dialog_input.cpp \ ../../../app/scanner/dialog_updateprogress.cpp \ ../../../app/scanner/dialog_upgrade.cpp \ - ../../../app/scanner/dialog_feedback.cpp + ../../../app/scanner/dialog_feedback.cpp \ + ../../../app/scanner/dialog_wrong_img.cpp HEADERS += \ ../../../app/scanner/VersionDll.h \ @@ -220,7 +221,8 @@ HEADERS += \ ../../../app/scanner/custom_file_dialog.h \ ../../../app/scanner/dialog_updateprogress.h \ ../../../app/scanner/dialog_upgrade.h \ - ../../../app/scanner/dialog_feedback.h + ../../../app/scanner/dialog_feedback.h \ + ../../../app/scanner/dialog_wrong_img.h FORMS += \ ../../../app/scanner/cutdialog.ui \ @@ -253,7 +255,8 @@ FORMS += \ ../../../app/scanner/dialog_input.ui \ ../../../app/scanner/dialog_updateprogress.ui \ ../../../app/scanner/dialog_upgrade.ui \ - ../../../app/scanner/dialog_feedback.ui + ../../../app/scanner/dialog_feedback.ui \ + ../../../app/scanner/dialog_wrong_img.ui TRANSLATIONS += \ ../../../app/scanner/Scanner_zh_CN.ts \ diff --git a/build.bat b/build.bat index 1282fae4..9580547b 100644 --- a/build.bat +++ b/build.bat @@ -1,8 +1,9 @@ -MSBuild.exe ./build/windows/HGSolution.sln /p:Configuration=Release /p:Platform=x86 +set BUILD_CMD="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe" +%BUILD_CMD% ./build/windows/HGSolution.sln /p:Configuration=Release /p:Platform=x86 cd /d ./build-qt/HGSolution/HGScanner qmake -r -tp vc HGScanner.pro -MSBuild.exe HuaGoScan.vcxproj /p:Configuration=Release /p:Platform=x86 +%BUILD_CMD% HuaGoScan.vcxproj /p:Configuration=Release /p:Platform=x86 del /f /s /q *.h del /f /s /q .qmake.stash del /f /s /q HuaGoScan_resource.rc @@ -13,7 +14,7 @@ rd /s /q release cd /d ../HGUpgrade qmake -r -tp vc HGUpgrade.pro -MSBuild.exe HuaGoScanUpgrade.vcxproj /p:Configuration=Release /p:Platform=x86 +%BUILD_CMD% HuaGoScanUpgrade.vcxproj /p:Configuration=Release /p:Platform=x86 del /f /s /q *.h del /f /s /q .qmake.stash del /f /s /q HuaGoScanUpgrade_resource.rc