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 /*********************************************************************************************