From 5aeba0677eadaef7e678539f5200b231405d2395 Mon Sep 17 00:00:00 2001 From: modehua Date: Mon, 12 Aug 2024 16:51:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=BD=E4=BA=A7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=8C=89=E9=94=AE=E6=89=AB=E6=8F=8F=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=B8=8D=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scantool/form_deviceconfig.cpp | 2 ++ app/scantool/mainwindow.cpp | 1 + build.sh | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/scantool/form_deviceconfig.cpp b/app/scantool/form_deviceconfig.cpp index 70af0f7a..51629eec 100644 --- a/app/scantool/form_deviceconfig.cpp +++ b/app/scantool/form_deviceconfig.cpp @@ -12,6 +12,8 @@ #include #include #include +#include +#include #if !defined(HG_CMP_MSC) #include diff --git a/app/scantool/mainwindow.cpp b/app/scantool/mainwindow.cpp index 98aeafcd..4dba7f03 100644 --- a/app/scantool/mainwindow.cpp +++ b/app/scantool/mainwindow.cpp @@ -16,6 +16,7 @@ #include "sqlite3.h" #include "cJSON.h" #include "HGString.h" +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) diff --git a/build.sh b/build.sh index f32e23ed..8e8cceef 100755 --- a/build.sh +++ b/build.sh @@ -35,6 +35,7 @@ rm -f HGUpgrade/Makefile rm -f HGUpload/Makefile rm -f HGVersion/Makefile rm -f HGWebService/Makefile +rm -f HGScanTool/Makefile if [ "${1}" == "hwall" ] || [ "${1}" == "hw" ]|| [ "${1}" == "hwweb" ] || [ "${1}" == "hwso" ] || [ "${1}" == "hwtwain" ]; then @@ -511,7 +512,7 @@ elif [ "${1}" == "dlall" ] || [ "${1}" == "dl" ] || [ "${1}" == "dlweb" ] || [ " else - if [ "${1}" == "hg" ] || [ "${1}" == "hgweb" ] || [ "${1}" == "hgso" ] || [ "${1}" == "hgtwain" ]; then + if [ "${1}" == "hg" ] || [ "${1}" == "hgweb" ] || [ "${1}" == "hgso" ] || [ "${1}" == "hgtwain" ] || [ "${1}" == "hgtool" ]; then cd HGBase qmake -qt=qt5 -makefile HGBase.pro @@ -576,6 +577,13 @@ else make -j8 cd ../ + elif [ "${1}" == "hgtool" ]; then + + cd HGScanTool + qmake -qt=qt5 -makefile HGScanTool.pro + make -j8 + cd ../ + else cd HGScannerLib