From 279b57881b8841d4914729e13e9f70d4e8cea797 Mon Sep 17 00:00:00 2001
From: gb <741021719@qq.com>
Date: Thu, 21 Sep 2023 11:25:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=8F=E8=AE=AE=E8=BD=AC?=
=?UTF-8?q?=E6=8D=A2=EF=BC=8C=E9=80=82=E5=BA=94=E6=96=B0JSON=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=AE=9E=E7=8E=B0SANE-TWAIN=E5=B1=9E?=
=?UTF-8?q?=E6=80=A7=E8=87=AA=E5=8A=A8=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
device/scanner.vcxproj | 2 ++
device/scanner.vcxproj.filters | 6 ++++++
sln/hgscanner.sln | 30 +++++++++++++++++-------------
twain/twain.vcxproj | 6 ++++++
twain/twain.vcxproj.filters | 3 +++
5 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj
index 22debd1..39c1b7a 100644
--- a/device/scanner.vcxproj
+++ b/device/scanner.vcxproj
@@ -228,6 +228,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
+
@@ -297,6 +298,7 @@ move /Y "$(TargetDir)$(ProjectName).exp" "$(ProjectDir)..\..\sdk\lib\win\$(Platf
+
diff --git a/device/scanner.vcxproj.filters b/device/scanner.vcxproj.filters
index 6d50054..55f69ba 100644
--- a/device/scanner.vcxproj.filters
+++ b/device/scanner.vcxproj.filters
@@ -225,6 +225,9 @@
dev
+
+ dev
+
@@ -482,6 +485,9 @@
dev
+
+ dev
+
diff --git a/sln/hgscanner.sln b/sln/hgscanner.sln
index 06bdea7..788be2d 100644
--- a/sln/hgscanner.sln
+++ b/sln/hgscanner.sln
@@ -15,12 +15,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twain", "..\twain\twain.vcx
{6EEC8A02-7F98-4422-8ED6-2434D43BD1E1} = {6EEC8A02-7F98-4422-8ED6-2434D43BD1E1}
EndProjectSection
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setup", "setup", "{F6774650-403F-476C-8373-2EA8D4AF06FF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgsetver", "hgsetver\hgsetver.vcxproj", "{A7528596-FBA2-4FFF-8649-C8D0EEBC6554}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lang", "..\lang\lang.vcxproj", "{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "kernel", "kernel", "{C43532EF-1B31-457F-B40B-61F22E91A13E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{53E5EDD9-13BA-4F3C-A387-C73CB06C686D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hgjson", "..\..\doc_and_tools\tools\apps\hgjson\hgjson.vcxproj", "{D3579C48-F5AB-4F15-9B49-A2970FBA76C5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -53,14 +55,6 @@ Global
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x64.Build.0 = Release|x64
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.ActiveCfg = Release|Win32
{C3B47CE2-27CE-4509-AB59-3C0F194F0FCE}.Release|x86.Build.0 = Release|Win32
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.ActiveCfg = Debug|x64
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x64.Build.0 = Debug|x64
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.ActiveCfg = Debug|Win32
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Debug|x86.Build.0 = Debug|Win32
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.ActiveCfg = Release|x64
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x64.Build.0 = Release|x64
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x86.ActiveCfg = Release|Win32
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554}.Release|x86.Build.0 = Release|Win32
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x64.ActiveCfg = Debug|x64
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x64.Build.0 = Debug|x64
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Debug|x86.ActiveCfg = Debug|Win32
@@ -69,12 +63,22 @@ Global
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x64.Build.0 = Release|x64
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x86.ActiveCfg = Release|Win32
{7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9}.Release|x86.Build.0 = Release|Win32
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Debug|x64.ActiveCfg = Debug|Win32
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Debug|x86.ActiveCfg = Debug|Win32
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Debug|x86.Build.0 = Debug|Win32
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x64.ActiveCfg = Release|Win32
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.ActiveCfg = Release|Win32
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {A7528596-FBA2-4FFF-8649-C8D0EEBC6554} = {F6774650-403F-476C-8373-2EA8D4AF06FF}
+ {6EEC8A02-7F98-4422-8ED6-2434D43BD1E1} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
+ {9ED4B425-73E0-423E-9712-455E777481B4} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
+ {C3B47CE2-27CE-4509-AB59-3C0F194F0FCE} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
+ {7776AB6D-6296-4F7A-A6ED-E9A4D6290DD9} = {C43532EF-1B31-457F-B40B-61F22E91A13E}
+ {D3579C48-F5AB-4F15-9B49-A2970FBA76C5} = {53E5EDD9-13BA-4F3C-A387-C73CB06C686D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A89068FF-95C4-3C1E-B126-70B66C9824BB}
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index ae21a70..e617ca3 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -294,6 +294,12 @@ move /Y "$(TargetPath)" "$(TargetDir)$(TargetName)"
NotUsing
NotUsing
+
+ NotUsing
+ NotUsing
+ NotUsing
+ NotUsing
+
NotUsing
NotUsing
diff --git a/twain/twain.vcxproj.filters b/twain/twain.vcxproj.filters
index c79bde8..522220f 100644
--- a/twain/twain.vcxproj.filters
+++ b/twain/twain.vcxproj.filters
@@ -49,6 +49,9 @@
imports
+
+ imports
+