lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.100.140:8099/sane/code_app

This commit is contained in:
luoliangyi 2022-07-25 16:50:23 +08:00
parent 046643a767 883c350016
commit f5437c1543
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-qt/HGSolution/HGScanner/HGScanner.pro
View File

@ -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 \

7
build.bat
View File

@ -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