From 7bb27b3f8a13caa40254403b1665ebb751d86aef Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Thu, 28 Jul 2022 17:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hgsane/sane_hg_mdw.cpp                |  3 ---
 sdk/hginclude/huagaoxxx_warraper_ex.h | 14 +++++++++-----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hgsane/sane_hg_mdw.cpp b/hgsane/sane_hg_mdw.cpp
index 2b962ec..7629cce 100644
--- a/hgsane/sane_hg_mdw.cpp
+++ b/hgsane/sane_hg_mdw.cpp
@@ -19,9 +19,6 @@
 #include "../../sdk/include/sane/sane_option_definitions.h"
 #include "sane_option.h"
 
-#ifndef VERSION_BUILD
-#define VERSION_BUILD	22030
-#endif
 #ifndef SIGUSR1
 #define SIGUSR1 10
 #endif
diff --git a/sdk/hginclude/huagaoxxx_warraper_ex.h b/sdk/hginclude/huagaoxxx_warraper_ex.h
index 29381fb..3cd561d 100644
--- a/sdk/hginclude/huagaoxxx_warraper_ex.h
+++ b/sdk/hginclude/huagaoxxx_warraper_ex.h
@@ -28,13 +28,17 @@
 #include "sane/sane_ex.h"
 
 #if defined(WIN32) || defined(_WIN64)
+#include "../../../sdk/include/huagao/brand.h"
 #ifndef HGSCANNER_EXPORT
-#ifdef _DEBUG
-#pragma comment(lib, "debug/scanner.lib")
+#pragma comment(lib, "scanner.lib")
+#endif
+#define VERSION_MAJOR		VERSION_MAIN
+#define VERSION_MINOR		VERSION_SUB
+#define VERSION_YEAR		VERSION_BUILD1
+#define VERSION_BUILD		VERSION_PATCH
+#define GET_BUILD_VER		VERSION_BUILD
 #else
-#pragma comment(lib, "release/scanner.lib")
-#endif
-#endif
+#define GET_BUILD_VER		VERSION_BUILD - 100000
 #endif
 
 /*********************************************************************************************