From d68ed41678ba3e61a37d00678de4d1e6a69250e8 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Sat, 30 Jul 2022 16:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
device/scanner.rc | 8 ++++----
device/scanner.vcxproj | 18 ++++++++++++------
device/scanner.vcxproj.filters | 18 ++++++++++++++++++
sane/sane.rc | 8 ++++----
twain/twain.vcxproj | 8 ++++----
5 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/device/scanner.rc b/device/scanner.rc
index ba7e981..08cbf77 100644
--- a/device/scanner.rc
+++ b/device/scanner.rc
@@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1032,2022,7281
- PRODUCTVERSION 4,1032,2022,7281
+ FILEVERSION 4,1033,2022,7301
+ PRODUCTVERSION 4,1033,2022,7301
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
- VALUE "FileVersion", "4.1032.2022.7281"
+ VALUE "FileVersion", "4.1033.2022.7301"
VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan"
- VALUE "ProductVersion", "4.1032.2022.7281"
+ VALUE "ProductVersion", "4.1033.2022.7301"
END
END
BLOCK "VarFileInfo"
diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj
index 1c0adda..d4f6ece 100644
--- a/device/scanner.vcxproj
+++ b/device/scanner.vcxproj
@@ -73,14 +73,14 @@
true
$(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)
- $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(LibraryPath)
+ $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\code_device\hgdriver\ImageProcess\lib\$(Configuration);$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
false
$(SolutionDir)..\..\code_device\hgdriver\3rdparty\nick;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\opencv\include\win;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\cyusb\inc\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\libtiff\include\;$(SolutionDir)..\..\code_device\hgdriver\3rdparty\log4cplus\include\;$(SolutionDir)..\..\code_device\sdk\;$(SolutionDir)..\..\code_device\hgdriver\ImageProcess\;$(SolutionDir)..\..\sdk\include\;$(SolutionDir)..\..\code_device\hgdriver\hgdev\;$(SolutionDir)..\..\code_device\hgdriver\wrapper\;$(ProjectDir);$(SolutionDir)..\..\code_device\hgdriver\3rdparty\tiff\include\;$(IncludePath)
- $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(LibraryPath)
+ $(ProjectDir)lib\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration);$(ProjectDir)..\..\code_device\hgdriver\ImageProcess\lib\$(Configuration);$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
@@ -102,7 +102,7 @@
Level3
true
- WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DIRECT_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
4996
MultiThreadedDebugDLL
@@ -111,7 +111,7 @@
Console
true
- opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib
+ opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zbar.lib;zxing.lib;zlib.lib;user32.lib
$(ProjectDir)device.def
@@ -134,7 +134,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
true
true
true
- WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ WIN32;HGSCANNER_EXPORT;CUSTOM_USBVIEW;OEM_NONE;_DIRECT_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
4996
stdcpp17
@@ -144,7 +144,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
true
true
true
- opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib
+ opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zbar.lib;zxing.lib;zlib.lib;user32.lib
$(ProjectDir)device.def
@@ -230,7 +230,10 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
+
+
+
@@ -305,11 +308,13 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
+
+
@@ -319,6 +324,7 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
+
diff --git a/device/scanner.vcxproj.filters b/device/scanner.vcxproj.filters
index b0c824f..81fcae0 100644
--- a/device/scanner.vcxproj.filters
+++ b/device/scanner.vcxproj.filters
@@ -186,6 +186,15 @@
dev
+
+ image
+
+
+ image
+
+
+ image
+
@@ -398,6 +407,15 @@
dev
+
+ image
+
+
+ image
+
+
+ image
+
diff --git a/sane/sane.rc b/sane/sane.rc
index a0452c9..6c9564b 100644
--- a/sane/sane.rc
+++ b/sane/sane.rc
@@ -248,8 +248,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1032,2022,7281
- PRODUCTVERSION 4,1032,2022,7281
+ FILEVERSION 4,1033,2022,7301
+ PRODUCTVERSION 4,1033,2022,7301
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -266,12 +266,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
- VALUE "FileVersion", "4.1032.2022.7281"
+ VALUE "FileVersion", "4.1033.2022.7301"
VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan"
- VALUE "ProductVersion", "4.1032.2022.7281"
+ VALUE "ProductVersion", "4.1033.2022.7301"
END
END
BLOCK "VarFileInfo"
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index 671de31..3cbb8de 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -49,7 +49,7 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain402.ds
+ huagaotwain239.ds
false
@@ -57,14 +57,14 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain402.ds
+ huagaotwain239.ds
Use
Level3
Disabled
- TWPP_NO_NOTES;TWPP_IS_DS;HGSCANNER_EXPORT;CUSTOM_USBVIEW;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
+ TWPP_NO_NOTES;TWPP_IS_DS;CUSTOM_USBVIEW;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
4996
pch.h
@@ -94,7 +94,7 @@ copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /yMaxSpeed
true
true
- TWPP_NO_NOTES;TWPP_IS_DS;HGSCANNER_EXPORT;CUSTOM_USBVIEW;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
+ TWPP_NO_NOTES;TWPP_IS_DS;CUSTOM_USBVIEW;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
4996
pch.h