updated to use vcpkg and updated WTLHelper

kunjun · Jul 16, 2023 · e8cf4ee · e8cf4ee
1 parent 28e6c37
commit e8cf4ee
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 36 deletions.
diff --git a/RegExp/AboutDlg.h b/RegExp/AboutDlg.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DialogHelper.h"
+#include <DialogHelper.h>
 
 class CAboutDlg : 
 	public CDialogImpl<CAboutDlg>,

diff --git a/RegExp/RegExp.vcxproj b/RegExp/RegExp.vcxproj
@@ -132,7 +132,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>..\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -156,7 +156,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>..\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -182,7 +182,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>..\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -210,7 +210,7 @@
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <LanguageStandard>stdcpp20</LanguageStandard>
-      <AdditionalIncludeDirectories>..\WTLHelper</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\WTLHelper\WTLHelper</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
@@ -381,15 +381,14 @@
     <Image Include="RegExp.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\x64\Release\KRegExp.Sys" />
     <None Include="cpp.hint" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Xml Include="manifest.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\WTLHelper\WTLHelper.vcxproj">
+    <ProjectReference Include="..\WTLHelper\WTLHelper\WTLHelper.vcxproj">
       <Project>{ae53419f-a769-4548-8e15-e311904df7df}</Project>
     </ProjectReference>
   </ItemGroup>

diff --git a/RegExp/RegExp.vcxproj.filters b/RegExp/RegExp.vcxproj.filters
@@ -314,7 +314,6 @@
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="cpp.hint" />
-    <None Include="..\x64\Release\KRegExp.Sys" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="RegExp.ico">

diff --git a/TotalRegistry.sln b/TotalRegistry.sln
@@ -4,18 +4,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.2.32408.312
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TotalReg", "RegExp\RegExp.vcxproj", "{C9050D58-5154-473A-B007-3D4FBB8692F9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5E5DF196-B875-4479-81F2-277965CF7797} = {5E5DF196-B875-4479-81F2-277965CF7797}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KRegExp", "KRegExp\KRegExp.vcxproj", "{5E5DF196-B875-4479-81F2-277965CF7797}"
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Installer", "Installer\Installer.vdproj", "{79BEBE58-CCAD-483F-8279-BBFF3C880F30}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C9050D58-5154-473A-B007-3D4FBB8692F9} = {C9050D58-5154-473A-B007-3D4FBB8692F9}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTLHelper", "WTLHelper\WTLHelper.vcxproj", "{AE53419F-A769-4548-8E15-E311904DF7DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTLHelper", "WTLHelper\WTLHelper\WTLHelper.vcxproj", "{AE53419F-A769-4548-8E15-E311904DF7DF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -40,27 +35,6 @@ Global
 		{C9050D58-5154-473A-B007-3D4FBB8692F9}.Release|x64.ActiveCfg = Release|x64
 		{C9050D58-5154-473A-B007-3D4FBB8692F9}.Release|x64.Build.0 = Release|x64
 		{C9050D58-5154-473A-B007-3D4FBB8692F9}.Release|x86.ActiveCfg = Release|x64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|ARM.ActiveCfg = Debug|ARM
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|ARM.Build.0 = Debug|ARM
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|ARM.Deploy.0 = Debug|ARM
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|ARM64.Build.0 = Debug|ARM64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|x64.ActiveCfg = Debug|x64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|x64.Build.0 = Debug|x64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|x86.ActiveCfg = Debug|Win32
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|x86.Build.0 = Debug|Win32
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Debug|x86.Deploy.0 = Debug|Win32
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|ARM.ActiveCfg = Release|ARM
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|ARM.Build.0 = Release|ARM
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|ARM.Deploy.0 = Release|ARM
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|ARM64.ActiveCfg = Release|ARM64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|ARM64.Deploy.0 = Release|ARM64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|x64.ActiveCfg = Release|x64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|x64.Build.0 = Release|x64
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|x86.ActiveCfg = Release|Win32
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|x86.Build.0 = Release|Win32
-		{5E5DF196-B875-4479-81F2-277965CF7797}.Release|x86.Deploy.0 = Release|Win32
 		{79BEBE58-CCAD-483F-8279-BBFF3C880F30}.Debug|ARM.ActiveCfg = Debug
 		{79BEBE58-CCAD-483F-8279-BBFF3C880F30}.Debug|ARM64.ActiveCfg = Debug
 		{79BEBE58-CCAD-483F-8279-BBFF3C880F30}.Debug|x64.ActiveCfg = Debug

diff --git a/WTLHelper b/WTLHelper
+4 −0		BasicDemo/BasicDemo.vcxproj
+20 −0		HexTest/AboutDlg.cpp
+25 −0		HexTest/AboutDlg.h
+48 −0		HexTest/HexTest.cpp
+1 −0		HexTest/HexTest.h
+282 −0		HexTest/HexTest.rc
+249 −0		HexTest/HexTest.vcxproj
+64 −0		HexTest/HexTest.vcxproj.filters
+69 −0		HexTest/MainFrm.cpp
+43 −0		HexTest/MainFrm.h
+60 −0		HexTest/View.cpp
+44 −0		HexTest/View.h
+4 −0		HexTest/packages.config
+ −		HexTest/res/HexTest.ico
+20 −0		HexTest/resource.h
+5 −0		HexTest/stdafx.cpp
+37 −0		HexTest/stdafx.h
+0 −551		TreeListViewCtrl.cpp
+0 −123		TreeListViewCtrl.h
+0 −102		UIFramework.h
+15 −1		WTLHelper.sln
+0 −0		WTLHelper/ClipboardHelper.cpp
+0 −0		WTLHelper/ClipboardHelper.h
+0 −0		WTLHelper/ColorHelper.cpp
+0 −0		WTLHelper/ColorHelper.h
+2 −2		WTLHelper/ColumnManager.cpp
+0 −0		WTLHelper/ColumnManager.h
+0 −0		WTLHelper/CompoundFile.cpp
+0 −0		WTLHelper/CompoundFile.h
+0 −0		WTLHelper/CompoundFileReaderWriter.cpp
+3 −3		WTLHelper/CompoundFileReaderWriter.h
+0 −0		WTLHelper/CustomButton.h
+19 −0		WTLHelper/CustomComboBox.h
+0 −0		WTLHelper/CustomDialog.h
+0 −0		WTLHelper/CustomEdit.h
+0 −0		WTLHelper/CustomHeader.h
+0 −0		WTLHelper/CustomListView.h
+14 −3		WTLHelper/CustomRebar.h
+0 −0		WTLHelper/CustomSplitterWindow.h
+0 −0		WTLHelper/CustomStatusBar.h
+0 −0		WTLHelper/CustomTabControl.h
+0 −0		WTLHelper/CustomTabView.cpp
+0 −0		WTLHelper/CustomTabView.h
+1 −3		WTLHelper/CustomToolBar.h
+0 −0		WTLHelper/CustomTreeView.h
+0 −0		WTLHelper/DialogHelper.h
+0 −4		WTLHelper/FrameView.h
+973 −0		WTLHelper/HexControl.cpp
+150 −0		WTLHelper/HexControl.h
+14 −0		WTLHelper/IBufferManager.h
+4 −2		WTLHelper/IListView.cpp
+0 −0		WTLHelper/IListView.h
+0 −0		WTLHelper/IconHelper.cpp
+0 −0		WTLHelper/IconHelper.h
+0 −0		WTLHelper/IniFile.cpp
+0 −0		WTLHelper/IniFile.h
+2 −1		WTLHelper/ListViewhelper.cpp
+1 −1		WTLHelper/ListViewhelper.h
+0 −0		WTLHelper/OwnerDrawnMenu.cpp
+0 −0		WTLHelper/OwnerDrawnMenu.h
+0 −0		WTLHelper/QuickFindEdit.h
+0 −0		WTLHelper/README.md
+60 −0		WTLHelper/Selection.cpp
+29 −0		WTLHelper/Selection.h
+13 −5		WTLHelper/Settings.cpp
+0 −0		WTLHelper/Settings.h
+0 −0		WTLHelper/SizeGrip.h
+0 −0		WTLHelper/SortHelper.cpp
+0 −0		WTLHelper/SortHelper.h
+22 −6		WTLHelper/SortedFilteredVector.h
+0 −0		WTLHelper/StandardColors.h
+0 −0		WTLHelper/StringHelper.cpp
+0 −0		WTLHelper/StringHelper.h
+0 −0		WTLHelper/Theme.cpp
+0 −0		WTLHelper/Theme.h
+6 −36		WTLHelper/ThemeHelper.cpp
+1 −3		WTLHelper/ThemeHelper.h
+0 −0		WTLHelper/ToolbarHelper.cpp
+0 −0		WTLHelper/ToolbarHelper.h
+0 −0		WTLHelper/TreeListView.h
+291 −0		WTLHelper/TreeListViewCtrl.cpp
+75 −0		WTLHelper/TreeListViewCtrl.h
+0 −0		WTLHelper/TreeViewHelper.h
+0 −0		WTLHelper/VersionResourceHelper.cpp
+0 −0		WTLHelper/VersionResourceHelper.h
+1 −1		WTLHelper/VirtualListView.h
+0 −0		WTLHelper/WTLHelper.cpp
+ −		WTLHelper/WTLHelper.rc
+33 −9		WTLHelper/WTLHelper.vcxproj
+129 −138		WTLHelper/WTLHelper.vcxproj.filters
+9 −0		WTLHelper/WTLHelperRes.h
+0 −0		WTLHelper/pch.cpp
+25 −0		WTLHelper/pch.h
+ −		WTLHelper/res/Collapsed.ico
+ −		WTLHelper/res/Collapsed2.ico
+ −		WTLHelper/res/Expanded.ico
+ −		WTLHelper/res/Expanded2.ico
+1 −1		packages.config
+0 −24		pch.h