From fc8efad621651745429fc9d5bd854be88c090924 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Wed, 19 Jul 2023 13:46:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0app=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=8C=E8=A7=A3=E5=86=B3pro=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=AF=E5=BE=84=E5=8C=85=E5=90=AB=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=E4=BA=A7=E7=94=9F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.bat                           | 42 ++++++++++++++++++++---------
 build2/qt/HGScanner/HGScanner.pro   |  4 +--
 build2/qt/HGScanner2/HGScanner2.pro |  4 +--
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/build.bat b/build.bat
index 42946ed1..2f526ed6 100644
--- a/build.bat
+++ b/build.bat
@@ -92,19 +92,35 @@ if "%OEM%" == "hw" (
 						MSBuild.exe NEUTwainUI.vcxproj /m:8 /p:Configuration=Release
 						cd /d ../
 					) else (
-						%QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolutionWin.pro
-						MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release /p:Platform=x64
-						cd /d HGTwainUI
-						%QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro
-						MSBuild.exe HGTwainUI.vcxproj /m:8 /p:Configuration=Release /p:Platform=x64
-						cd /d ../
-						
-						%QT_PATH%/msvc2017/bin/qmake -r -tp vc HGSolutionWin.pro
-						MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release			
-						cd /d HGTwainUI
-						%QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro
-						MSBuild.exe HGTwainUI.vcxproj /m:8 /p:Configuration=Release
-						cd /d ../
+						if "%OEM%" == "dl" (
+							%QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_DELI" -r -tp vc HGSolutionWin.pro
+							MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release /p:Platform=x64
+							cd /d HGTwainUI
+							%QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_DELI" -r -tp vc HGTwainUI.pro
+							MSBuild.exe DLTwainUI.vcxproj /m:8 /p:Configuration=Release /p:Platform=x64
+							cd /d ../
+							
+							%QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_DELI" -r -tp vc HGSolutionWin.pro
+							MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release	
+							cd /d HGTwainUI
+							%QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake "DEFINES += OEM_DELI" -r -tp vc HGTwainUI.pro
+							MSBuild.exe DLTwainUI.vcxproj /m:8 /p:Configuration=Release
+							cd /d ../
+						) else (
+							%QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolutionWin.pro
+							MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release /p:Platform=x64
+							cd /d HGTwainUI
+							%QT_STATIC_PATH%/x64-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro
+							MSBuild.exe HGTwainUI.vcxproj /m:8 /p:Configuration=Release /p:Platform=x64
+							cd /d ../
+							
+							%QT_PATH%/msvc2017/bin/qmake -r -tp vc HGSolutionWin.pro
+							MSBuild.exe HGSolutionWin.sln /m:8 /p:Configuration=Release			
+							cd /d HGTwainUI
+							%QT_STATIC_PATH%/x86-windows-static-md/tools/qt5/bin/qmake -r -tp vc HGTwainUI.pro
+							MSBuild.exe HGTwainUI.vcxproj /m:8 /p:Configuration=Release
+							cd /d ../
+						)
 					)
 				)
 			)
diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro
index 0e2b6b2e..2d1c0539 100644
--- a/build2/qt/HGScanner/HGScanner.pro
+++ b/build2/qt/HGScanner/HGScanner.pro
@@ -47,7 +47,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
                     } else {
                         if (contains(DEFINES, OEM_DELI)) {
                             RC_ICONS = ../../../app/scanner/image_rsc/logo/deli.ico
-                            TARGET = DELI SCAN
+                            TARGET = "DELI SCAN"
                         } else {
                             RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico
                             TARGET = HuaGoScan
@@ -168,7 +168,7 @@ win32 {
         SRCPDB_FILE = $$replace(SRCPDB_FILE, /, \\)
         message(SRCPDB_FILE: $$SRCPDB_FILE)
 
-        QMAKE_POST_LINK += xcopy /y $$SRCEXE_FILE $$DESTEXE_PATH && xcopy /y $$SRCPDB_FILE $$DESTEXE_PATH
+        QMAKE_POST_LINK += xcopy /y \"$$SRCEXE_FILE\" $$DESTEXE_PATH && xcopy /y \"$$SRCPDB_FILE\" $$DESTEXE_PATH
     }
 }
 
diff --git a/build2/qt/HGScanner2/HGScanner2.pro b/build2/qt/HGScanner2/HGScanner2.pro
index 2a6c9816..eea77a15 100644
--- a/build2/qt/HGScanner2/HGScanner2.pro
+++ b/build2/qt/HGScanner2/HGScanner2.pro
@@ -47,7 +47,7 @@ if (contains(DEFINES, OEM_HANWANG)) {
                     } else {
                         if (contains(DEFINES, OEM_DELI)) {
                             RC_ICONS = ../../../app/scanner2/image_rsc/logo/deli.ico
-                            TARGET = DELI SCAN2
+                            TARGET = "DELI SCAN2"
                         } else {
                             RC_ICONS = ../../../app/scanner2/image_rsc/logo/logo.ico
                             TARGET = HuaGoScan2
@@ -169,7 +169,7 @@ win32 {
         SRCPDB_FILE = $$replace(SRCPDB_FILE, /, \\)
         message(SRCPDB_FILE: $$SRCPDB_FILE)
 
-        QMAKE_POST_LINK += xcopy /y $$SRCEXE_FILE $$DESTEXE_PATH && xcopy /y $$SRCPDB_FILE $$DESTEXE_PATH
+        QMAKE_POST_LINK += xcopy /y \"$$SRCEXE_FILE\" $$DESTEXE_PATH && xcopy /y \"$$SRCPDB_FILE\" $$DESTEXE_PATH
     }
 }