diff options
| author | Per Larsson <[email protected]> | 2021-12-15 14:05:15 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-15 14:05:15 +0100 |
| commit | a7af402bd38b12364e00cf2de8227c7db0911d14 (patch) | |
| tree | 9aca1e4d3ff9f881710564689cfc9e24396c6911 | |
| parent | Initialize CidStore to null. (diff) | |
| download | zen-a7af402bd38b12364e00cf2de8227c7db0911d14.tar.xz zen-a7af402bd38b12364e00cf2de8227c7db0911d14.zip | |
Added preprocessing config file and removed Visual Studio files.
30 files changed, 28 insertions, 1996 deletions
@@ -1,3 +1,6 @@ +set_version("0.1.0", { build = "%Y%m%d%H%M" }) +set_configvar("ZEN_SCHEMA_VERSION", 3) -- changed cas oplog format (p3rl) + add_requires( "vcpkg::asio", "vcpkg::cpr", diff --git a/zen.sln b/zen.sln deleted file mode 100644 index c1bced170..000000000 --- a/zen.sln +++ /dev/null @@ -1,106 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31612.314 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{4EA55E5B-18A1-4E66-B821-44575BC11EA7}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - .gitmodules = .gitmodules - CODING.md = CODING.md - README.md = README.md - RESTAPI.md = RESTAPI.md - vcpkg.json = vcpkg.json - xmake.lua = xmake.lua - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zencore", "zencore\zencore.vcxproj", "{D75BF9AB-C61E-4FFF-AD59-1563430F05E2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zencore-test", "zencore-test\zencore-test.vcxproj", "{C00173DF-B76E-4989-B576-FE2B780B2580}" - ProjectSection(ProjectDependencies) = postProject - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2} = {D75BF9AB-C61E-4FFF-AD59-1563430F05E2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenserver", "zenserver\zenserver.vcxproj", "{8398D81C-B1B6-4327-82B1-06EACB8A144F}" - ProjectSection(ProjectDependencies) = postProject - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2} = {D75BF9AB-C61E-4FFF-AD59-1563430F05E2} - {26CBBAEB-14C1-4EFC-877D-80F48215651C} = {26CBBAEB-14C1-4EFC-877D-80F48215651C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zen", "zen\zen.vcxproj", "{CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}" - ProjectSection(ProjectDependencies) = postProject - {8398D81C-B1B6-4327-82B1-06EACB8A144F} = {8398D81C-B1B6-4327-82B1-06EACB8A144F} - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2} = {D75BF9AB-C61E-4FFF-AD59-1563430F05E2} - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "thirdparty", "thirdparty", "{3CB3B9E8-B4CB-4D2E-821A-2AFE34093BEF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenserver-test", "zenserver-test\zenserver-test.vcxproj", "{2563249E-E695-4CC4-8FFA-335D07680C9D}" - ProjectSection(ProjectDependencies) = postProject - {8398D81C-B1B6-4327-82B1-06EACB8A144F} = {8398D81C-B1B6-4327-82B1-06EACB8A144F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenstore", "zenstore\zenstore.vcxproj", "{26CBBAEB-14C1-4EFC-877D-80F48215651C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenutil", "zenutil\zenutil.vcxproj", "{77F8315D-B21D-4DB0-9A6F-2D3359F88A70}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zentest-appstub", "zentest-appstub\zentest-appstub.vcxproj", "{7FFC7E77-D038-44E9-8D84-41918C355F29}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenhttp", "zenhttp\zenhttp.vcxproj", "{8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zenstore-test", "zenstore-test\zenstore-test.vcxproj", "{C001A3DF-B76E-4989-B576-FE2B78AB2580}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Debug|x64.ActiveCfg = Debug|x64 - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Debug|x64.Build.0 = Debug|x64 - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Release|x64.ActiveCfg = Release|x64 - {D75BF9AB-C61E-4FFF-AD59-1563430F05E2}.Release|x64.Build.0 = Release|x64 - {C00173DF-B76E-4989-B576-FE2B780B2580}.Debug|x64.ActiveCfg = Debug|x64 - {C00173DF-B76E-4989-B576-FE2B780B2580}.Debug|x64.Build.0 = Debug|x64 - {C00173DF-B76E-4989-B576-FE2B780B2580}.Release|x64.ActiveCfg = Release|x64 - {C00173DF-B76E-4989-B576-FE2B780B2580}.Release|x64.Build.0 = Release|x64 - {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Debug|x64.ActiveCfg = Debug|x64 - {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Debug|x64.Build.0 = Debug|x64 - {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Release|x64.ActiveCfg = Release|x64 - {8398D81C-B1B6-4327-82B1-06EACB8A144F}.Release|x64.Build.0 = Release|x64 - {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Debug|x64.ActiveCfg = Debug|x64 - {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Debug|x64.Build.0 = Debug|x64 - {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Release|x64.ActiveCfg = Release|x64 - {CA7B9E04-A2D3-4A39-A7D7-FB156A2C6A48}.Release|x64.Build.0 = Release|x64 - {2563249E-E695-4CC4-8FFA-335D07680C9D}.Debug|x64.ActiveCfg = Debug|x64 - {2563249E-E695-4CC4-8FFA-335D07680C9D}.Debug|x64.Build.0 = Debug|x64 - {2563249E-E695-4CC4-8FFA-335D07680C9D}.Release|x64.ActiveCfg = Release|x64 - {2563249E-E695-4CC4-8FFA-335D07680C9D}.Release|x64.Build.0 = Release|x64 - {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Debug|x64.ActiveCfg = Debug|x64 - {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Debug|x64.Build.0 = Debug|x64 - {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Release|x64.ActiveCfg = Release|x64 - {26CBBAEB-14C1-4EFC-877D-80F48215651C}.Release|x64.Build.0 = Release|x64 - {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Debug|x64.ActiveCfg = Debug|x64 - {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Debug|x64.Build.0 = Debug|x64 - {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Release|x64.ActiveCfg = Release|x64 - {77F8315D-B21D-4DB0-9A6F-2D3359F88A70}.Release|x64.Build.0 = Release|x64 - {7FFC7E77-D038-44E9-8D84-41918C355F29}.Debug|x64.ActiveCfg = Debug|x64 - {7FFC7E77-D038-44E9-8D84-41918C355F29}.Debug|x64.Build.0 = Debug|x64 - {7FFC7E77-D038-44E9-8D84-41918C355F29}.Release|x64.ActiveCfg = Release|x64 - {7FFC7E77-D038-44E9-8D84-41918C355F29}.Release|x64.Build.0 = Release|x64 - {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Debug|x64.ActiveCfg = Debug|x64 - {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Debug|x64.Build.0 = Debug|x64 - {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Release|x64.ActiveCfg = Release|x64 - {8EEB3BE5-7001-46BF-AAFD-EDB7558AC012}.Release|x64.Build.0 = Release|x64 - {C001A3DF-B76E-4989-B576-FE2B78AB2580}.Debug|x64.ActiveCfg = Debug|x64 - {C001A3DF-B76E-4989-B576-FE2B78AB2580}.Debug|x64.Build.0 = Debug|x64 - {C001A3DF-B76E-4989-B576-FE2B78AB2580}.Release|x64.ActiveCfg = Release|x64 - {C001A3DF-B76E-4989-B576-FE2B78AB2580}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6E9AFFA0-9B14-4264-B7D1-B61F395A0B5F} - EndGlobalSection -EndGlobal diff --git a/zen/zen.vcxproj b/zen/zen.vcxproj deleted file mode 100644 index 717319de4..000000000 --- a/zen/zen.vcxproj +++ /dev/null @@ -1,145 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>16.0</VCProjectVersion> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{ca7b9e04-a2d3-4a39-a7d7-fb156a2c6a48}</ProjectGuid> - <RootNamespace>zen</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_debug.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_release.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ShowProgress>NotSet</ShowProgress> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="chunk\chunk.cpp" /> - <ClCompile Include="cmds\cache.cpp" /> - <ClCompile Include="cmds\copy.cpp" /> - <ClCompile Include="cmds\dedup.cpp" /> - <ClCompile Include="cmds\hash.cpp" /> - <ClCompile Include="cmds\print.cpp" /> - <ClCompile Include="cmds\run.cpp" /> - <ClCompile Include="cmds\scrub.cpp" /> - <ClCompile Include="cmds\status.cpp" /> - <ClCompile Include="cmds\top.cpp" /> - <ClCompile Include="cmds\up.cpp" /> - <ClCompile Include="internalfile.cpp" /> - <ClCompile Include="zen.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="chunk\chunk.h" /> - <ClInclude Include="cmds\cache.h" /> - <ClInclude Include="cmds\copy.h" /> - <ClInclude Include="cmds\dedup.h" /> - <ClInclude Include="cmds\hash.h" /> - <ClInclude Include="cmds\print.h" /> - <ClInclude Include="cmds\run.h" /> - <ClInclude Include="cmds\scrub.h" /> - <ClInclude Include="cmds\status.h" /> - <ClInclude Include="cmds\top.h" /> - <ClInclude Include="cmds\up.h" /> - <ClInclude Include="internalfile.h" /> - <ClInclude Include="zen.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - <ProjectReference Include="..\zenhttp\zenhttp.vcxproj"> - <Project>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</Project> - </ProjectReference> - <ProjectReference Include="..\zenstore\zenstore.vcxproj"> - <Project>{26cbbaeb-14c1-4efc-877d-80f48215651c}</Project> - </ProjectReference> - <ProjectReference Include="..\zenutil\zenutil.vcxproj"> - <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zen/zen.vcxproj.filters b/zen/zen.vcxproj.filters deleted file mode 100644 index 79580286c..000000000 --- a/zen/zen.vcxproj.filters +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="chunk\chunk.cpp" /> - <ClCompile Include="zen.cpp" /> - <ClCompile Include="internalfile.cpp" /> - <ClCompile Include="cmds\hash.cpp"> - <Filter>cmds</Filter> - </ClCompile> - <ClCompile Include="cmds\dedup.cpp"> - <Filter>cmds</Filter> - </ClCompile> - <ClCompile Include="cmds\copy.cpp"> - <Filter>cmds</Filter> - </ClCompile> - <ClCompile Include="cmds\run.cpp"> - <Filter>cmds</Filter> - </ClCompile> - <ClCompile Include="cmds\top.cpp"> - <Filter>cmds</Filter> - </ClCompile> - <ClCompile Include="cmds\status.cpp"> - <Filter>cmds</Filter> - </ClCompile> - <ClCompile Include="cmds\up.cpp" /> - <ClCompile Include="cmds\cache.cpp" /> - <ClCompile Include="cmds\scrub.cpp" /> - <ClCompile Include="cmds\print.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="chunk\chunk.h" /> - <ClInclude Include="zen.h" /> - <ClInclude Include="internalfile.h" /> - <ClInclude Include="cmds\hash.h"> - <Filter>cmds</Filter> - </ClInclude> - <ClInclude Include="cmds\dedup.h"> - <Filter>cmds</Filter> - </ClInclude> - <ClInclude Include="cmds\copy.h"> - <Filter>cmds</Filter> - </ClInclude> - <ClInclude Include="cmds\run.h"> - <Filter>cmds</Filter> - </ClInclude> - <ClInclude Include="cmds\top.h"> - <Filter>cmds</Filter> - </ClInclude> - <ClInclude Include="cmds\status.h"> - <Filter>cmds</Filter> - </ClInclude> - <ClInclude Include="cmds\up.h" /> - <ClInclude Include="cmds\cache.h" /> - <ClInclude Include="cmds\scrub.h" /> - <ClInclude Include="cmds\print.h" /> - </ItemGroup> - <ItemGroup> - <Filter Include="cmds"> - <UniqueIdentifier>{2e06a54c-52be-4260-9275-a4232d01a53c}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zen_base_debug.props b/zen_base_debug.props deleted file mode 100644 index c147de362..000000000 --- a/zen_base_debug.props +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> - <ItemDefinitionGroup> - <ClCompile> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <BasicRuntimeChecks>StackFrameRuntimeCheck</BasicRuntimeChecks> - <SupportJustMyCode>false</SupportJustMyCode> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup /> -</Project>
\ No newline at end of file diff --git a/zen_base_release.props b/zen_base_release.props deleted file mode 100644 index 886ce6890..000000000 --- a/zen_base_release.props +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup /> - <ItemDefinitionGroup> - <ClCompile> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - </ItemDefinitionGroup> - <ItemGroup /> -</Project>
\ No newline at end of file diff --git a/zencore-test/zencore-test.vcxproj b/zencore-test/zencore-test.vcxproj deleted file mode 100644 index 8ca214c3c..000000000 --- a/zencore-test/zencore-test.vcxproj +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{C00173DF-B76E-4989-B576-FE2B780B2580}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>zencoretest</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <WholeProgramOptimization>false</WholeProgramOptimization> - <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ShowProgress>NotSet</ShowProgress> - </Link> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="targetver.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="zencore-test.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zencore-test/zencore-test.vcxproj.filters b/zencore-test/zencore-test.vcxproj.filters deleted file mode 100644 index fc33e90b9..000000000 --- a/zencore-test/zencore-test.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="targetver.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="zencore-test.cpp" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zencore/.gitignore b/zencore/.gitignore new file mode 100644 index 000000000..77d39c17e --- /dev/null +++ b/zencore/.gitignore @@ -0,0 +1 @@ +include/zencore/config.h diff --git a/zencore/include/zencore/config.h.in b/zencore/include/zencore/config.h.in new file mode 100644 index 000000000..3372eca2a --- /dev/null +++ b/zencore/include/zencore/config.h.in @@ -0,0 +1,16 @@ +// Copyright Epic Games, Inc. All Rights Reserved. + +#pragma once + +// NOTE: Generated from config.h.in + +#define ZEN_CFG_VERSION "${VERSION}" +#define ZEN_CFG_VERSION_MAJOR ${VERSION_MAJOR} +#define ZEN_CFG_VERSION_MINOR ${VERSION_MINOR} +#define ZEN_CFG_VERSION_ALTER ${VERSION_ALTER} +#define ZEN_CFG_VERSION_BUILD ${VERSION_BUILD} +#define ZEN_CFG_VERSION_BRANCH "${GIT_BRANCH}" +#define ZEN_CFG_VERSION_COMMIT "${GIT_COMMIT}" +#define ZEN_CFG_VERSION_BUILD_STRING "${VERSION}-${plat}-${arch}-${mode}" +#define ZEN_CFG_VERSION_BUILD_STRING_FULL "${VERSION}-${VERSION_BUILD}-${plat}-${arch}-${mode}-${GIT_COMMIT}" +#define ZEN_CFG_SCHEMA_VERSION ${ZEN_SCHEMA_VERSION} diff --git a/zencore/xmake.lua b/zencore/xmake.lua index a9e9ad85c..7475d7e1c 100644 --- a/zencore/xmake.lua +++ b/zencore/xmake.lua @@ -1,6 +1,8 @@ target('zencore') set_kind("static") add_headerfiles("**.h") + add_configfiles("include/zencore/config.h.in") + set_configdir("include/zencore") add_files("**.cpp") add_includedirs("include", {public=true}) add_includedirs("$(projectdir)/thirdparty/utfcpp/source") diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj deleted file mode 100644 index 49e959b96..000000000 --- a/zencore/zencore.vcxproj +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{D75BF9AB-C61E-4FFF-AD59-1563430F05E2}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>zencore</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_debug.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_release.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <EnableMicrosoftCodeAnalysis>false</EnableMicrosoftCodeAnalysis> - <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories> - <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> - <LanguageStandard>stdcpplatest</LanguageStandard> - <TreatWarningAsError>true</TreatWarningAsError> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include;..\thirdparty\utfcpp\source</AdditionalIncludeDirectories> - <WholeProgramOptimization>false</WholeProgramOptimization> - <LanguageStandard>stdcpplatest</LanguageStandard> - <TreatWarningAsError>true</TreatWarningAsError> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - <Lib> - <Verbose>true</Verbose> - </Lib> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="include\zencore\atomic.h" /> - <ClInclude Include="include\zencore\base64.h" /> - <ClInclude Include="include\zencore\blake3.h" /> - <ClInclude Include="include\zencore\blockingqueue.h" /> - <ClInclude Include="include\zencore\compactbinaryvalue.h" /> - <ClInclude Include="include\zencore\compositebuffer.h" /> - <ClInclude Include="include\zencore\crc32.h" /> - <ClInclude Include="include\zencore\endian.h" /> - <ClInclude Include="include\zencore\enumflags.h" /> - <ClInclude Include="include\zencore\except.h" /> - <ClInclude Include="include\zencore\compress.h" /> - <ClInclude Include="include\zencore\filesystem.h" /> - <ClInclude Include="include\zencore\fmtutils.h" /> - <ClInclude Include="include\zencore\intmath.h" /> - <ClInclude Include="include\zencore\iohash.h" /> - <ClInclude Include="include\zencore\logging.h" /> - <ClInclude Include="include\zencore\md5.h" /> - <ClInclude Include="include\zencore\memory.h" /> - <ClInclude Include="include\zencore\meta.h" /> - <ClInclude Include="include\zencore\mpscqueue.h" /> - <ClInclude Include="include\zencore\refcount.h" /> - <ClInclude Include="include\zencore\scopeguard.h" /> - <ClInclude Include="include\zencore\session.h" /> - <ClInclude Include="include\zencore\sha1.h" /> - <ClInclude Include="include\zencore\iobuffer.h" /> - <ClInclude Include="include\zencore\sharedbuffer.h" /> - <ClInclude Include="include\zencore\stats.h" /> - <ClInclude Include="include\zencore\stream.h" /> - <ClInclude Include="include\zencore\string.h" /> - <ClInclude Include="include\zencore\targetver.h" /> - <ClInclude Include="include\zencore\testing.h" /> - <ClInclude Include="include\zencore\testutils.h" /> - <ClInclude Include="include\zencore\thread.h" /> - <ClInclude Include="include\zencore\timer.h" /> - <ClInclude Include="include\zencore\uid.h" /> - <ClInclude Include="include\zencore\compactbinary.h" /> - <ClInclude Include="include\zencore\compactbinarybuilder.h" /> - <ClInclude Include="include\zencore\compactbinarypackage.h" /> - <ClInclude Include="include\zencore\compactbinaryvalidation.h" /> - <ClInclude Include="include\zencore\varint.h" /> - <ClInclude Include="include\zencore\windows.h" /> - <ClInclude Include="include\zencore\xxhash.h" /> - <ClInclude Include="include\zencore\zencore.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="base64.cpp" /> - <ClCompile Include="blake3.cpp" /> - <ClCompile Include="compositebuffer.cpp" /> - <ClCompile Include="compress.cpp" /> - <ClCompile Include="crc32.cpp" /> - <ClCompile Include="except.cpp" /> - <ClCompile Include="filesystem.cpp" /> - <ClCompile Include="intmath.cpp" /> - <ClCompile Include="iohash.cpp" /> - <ClCompile Include="logging.cpp" /> - <ClCompile Include="md5.cpp" /> - <ClCompile Include="memory.cpp" /> - <ClCompile Include="mpscqueue.cpp" /> - <ClCompile Include="refcount.cpp" /> - <ClCompile Include="session.cpp" /> - <ClCompile Include="sha1.cpp"> - <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MaxSpeed</Optimization> - <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AnySuitable</InlineFunctionExpansion> - <IntrinsicFunctions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</IntrinsicFunctions> - <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Default</BasicRuntimeChecks> - </ClCompile> - <ClCompile Include="iobuffer.cpp" /> - <ClCompile Include="sharedbuffer.cpp" /> - <ClCompile Include="stats.cpp" /> - <ClCompile Include="stream.cpp" /> - <ClCompile Include="string.cpp" /> - <ClCompile Include="testutils.cpp" /> - <ClCompile Include="thread.cpp" /> - <ClCompile Include="timer.cpp" /> - <ClCompile Include="uid.cpp" /> - <ClCompile Include="compactbinary.cpp" /> - <ClCompile Include="compactbinarybuilder.cpp" /> - <ClCompile Include="compactbinarypackage.cpp" /> - <ClCompile Include="compactbinaryvalidation.cpp" /> - <ClCompile Include="xxhash.cpp" /> - <ClCompile Include="zencore.cpp" /> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zencore/zencore.vcxproj.filters b/zencore/zencore.vcxproj.filters deleted file mode 100644 index 1aedf9eab..000000000 --- a/zencore/zencore.vcxproj.filters +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="include\zencore\intmath.h" /> - <ClInclude Include="include\zencore\scopeguard.h" /> - <ClInclude Include="include\zencore\sha1.h" /> - <ClInclude Include="include\zencore\targetver.h" /> - <ClInclude Include="include\zencore\zencore.h" /> - <ClInclude Include="include\zencore\compactbinary.h" /> - <ClInclude Include="include\zencore\uid.h" /> - <ClInclude Include="include\zencore\compress.h" /> - <ClInclude Include="include\zencore\timer.h" /> - <ClInclude Include="include\zencore\thread.h" /> - <ClInclude Include="include\zencore\string.h" /> - <ClInclude Include="include\zencore\stream.h" /> - <ClInclude Include="include\zencore\stats.h" /> - <ClInclude Include="include\zencore\blake3.h" /> - <ClInclude Include="include\zencore\atomic.h" /> - <ClInclude Include="include\zencore\enumflags.h" /> - <ClInclude Include="include\zencore\except.h" /> - <ClInclude Include="include\zencore\filesystem.h" /> - <ClInclude Include="include\zencore\refcount.h" /> - <ClInclude Include="include\zencore\memory.h" /> - <ClInclude Include="include\zencore\windows.h" /> - <ClInclude Include="include\zencore\iobuffer.h" /> - <ClInclude Include="include\zencore\sharedbuffer.h" /> - <ClInclude Include="include\zencore\iohash.h" /> - <ClInclude Include="include\zencore\compactbinarybuilder.h" /> - <ClInclude Include="include\zencore\compactbinarypackage.h" /> - <ClInclude Include="include\zencore\compactbinaryvalidation.h" /> - <ClInclude Include="include\zencore\md5.h" /> - <ClInclude Include="include\zencore\fmtutils.h" /> - <ClInclude Include="include\zencore\xxhash.h" /> - <ClInclude Include="include\zencore\varint.h" /> - <ClInclude Include="include\zencore\endian.h" /> - <ClInclude Include="include\zencore\compositebuffer.h" /> - <ClInclude Include="include\zencore\crc32.h" /> - <ClInclude Include="include\zencore\meta.h" /> - <ClInclude Include="include\zencore\logging.h" /> - <ClInclude Include="include\zencore\session.h" /> - <ClInclude Include="include\zencore\testutils.h" /> - <ClInclude Include="include\zencore\testing.h" /> - <ClInclude Include="include\zencore\mpscqueue.h" /> - <ClInclude Include="include\zencore\base64.h" /> - <ClInclude Include="include\zencore\compactbinaryvalue.h" /> - <ClInclude Include="include\zencore\blockingqueue.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="sha1.cpp" /> - <ClCompile Include="zencore.cpp" /> - <ClCompile Include="compactbinary.cpp" /> - <ClCompile Include="uid.cpp" /> - <ClCompile Include="blake3.cpp" /> - <ClCompile Include="filesystem.cpp" /> - <ClCompile Include="memory.cpp" /> - <ClCompile Include="refcount.cpp" /> - <ClCompile Include="stats.cpp" /> - <ClCompile Include="stream.cpp" /> - <ClCompile Include="string.cpp" /> - <ClCompile Include="thread.cpp" /> - <ClCompile Include="timer.cpp" /> - <ClCompile Include="iobuffer.cpp" /> - <ClCompile Include="sharedbuffer.cpp" /> - <ClCompile Include="iohash.cpp" /> - <ClCompile Include="compactbinarybuilder.cpp" /> - <ClCompile Include="compactbinarypackage.cpp" /> - <ClCompile Include="compactbinaryvalidation.cpp" /> - <ClCompile Include="md5.cpp" /> - <ClCompile Include="except.cpp" /> - <ClCompile Include="xxhash.cpp" /> - <ClCompile Include="compress.cpp" /> - <ClCompile Include="compositebuffer.cpp" /> - <ClCompile Include="crc32.cpp" /> - <ClCompile Include="logging.cpp" /> - <ClCompile Include="intmath.cpp" /> - <ClCompile Include="session.cpp" /> - <ClCompile Include="testutils.cpp" /> - <ClCompile Include="mpscqueue.cpp" /> - <ClCompile Include="base64.cpp" /> - </ItemGroup> - <ItemGroup> - <Filter Include="CAS"> - <UniqueIdentifier>{af5266fa-37a5-494c-9116-b15a3e6edd29}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zenfs_common.props b/zenfs_common.props deleted file mode 100644 index 3d1b5e9c8..000000000 --- a/zenfs_common.props +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ImportGroup Label="PropertySheets" /> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup> - <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(SolutionDir)\thirdparty\BLAKE3\lib\Win64;$(SolutionDir)\thirdparty\Oodle\lib\Win64</LibraryPath> - </PropertyGroup> - <ItemDefinitionGroup> - <ClCompile> - <LanguageStandard>stdcpplatest</LanguageStandard> - <WarningLevel>Level4</WarningLevel> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <TreatWarningAsError>true</TreatWarningAsError> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_WIN32_WINNT=0x0A00 ;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <IgnoreSpecificDefaultLibraries>msvcrt</IgnoreSpecificDefaultLibraries> - </Link> - </ItemDefinitionGroup> - <ItemGroup /> -</Project>
\ No newline at end of file diff --git a/zenhttp/zenhttp.vcxproj b/zenhttp/zenhttp.vcxproj deleted file mode 100644 index c86a41283..000000000 --- a/zenhttp/zenhttp.vcxproj +++ /dev/null @@ -1,129 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>16.0</VCProjectVersion> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</ProjectGuid> - <RootNamespace>zenhttp</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zen_base_debug.props" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zen_base_release.props" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Label="Vcpkg"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgUseStatic>true</VcpkgUseStatic> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgUseStatic>true</VcpkgUseStatic> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="httpasio.cpp" /> - <ClCompile Include="httpclient.cpp" /> - <ClCompile Include="httpnull.cpp" /> - <ClCompile Include="httpserver.cpp" /> - <ClCompile Include="httpshared.cpp" /> - <ClCompile Include="httpsys.cpp" /> - <ClCompile Include="iothreadpool.cpp" /> - <ClCompile Include="workthreadpool.cpp" /> - <ClCompile Include="zenhttp.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="httpasio.h" /> - <ClInclude Include="httpnull.h" /> - <ClInclude Include="httpsys.h" /> - <ClInclude Include="include\zenhttp\httpclient.h" /> - <ClInclude Include="include\zenhttp\httpcommon.h" /> - <ClInclude Include="include\zenhttp\httpserver.h" /> - <ClInclude Include="include\zenhttp\httpshared.h" /> - <ClInclude Include="include\zenhttp\zenhttp.h" /> - <ClInclude Include="iothreadpool.h" /> - <ClInclude Include="workthreadpool.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zenhttp/zenhttp.vcxproj.filters b/zenhttp/zenhttp.vcxproj.filters deleted file mode 100644 index ffc98b1c6..000000000 --- a/zenhttp/zenhttp.vcxproj.filters +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="httpclient.cpp" /> - <ClCompile Include="httpserver.cpp" /> - <ClCompile Include="httpsys.cpp" /> - <ClCompile Include="iothreadpool.cpp" /> - <ClCompile Include="httpnull.cpp" /> - <ClCompile Include="httpshared.cpp" /> - <ClCompile Include="zenhttp.cpp" /> - <ClCompile Include="workthreadpool.cpp" /> - <ClCompile Include="httpasio.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="include\zenhttp\httpclient.h" /> - <ClInclude Include="include\zenhttp\httpserver.h" /> - <ClInclude Include="httpsys.h" /> - <ClInclude Include="iothreadpool.h" /> - <ClInclude Include="include\zenhttp\zenhttp.h" /> - <ClInclude Include="httpnull.h" /> - <ClInclude Include="include\zenhttp\httpcommon.h" /> - <ClInclude Include="include\zenhttp\httpshared.h" /> - <ClInclude Include="workthreadpool.h" /> - <ClInclude Include="httpasio.h" /> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zenserver-test/zenserver-test.vcxproj b/zenserver-test/zenserver-test.vcxproj deleted file mode 100644 index d632e395e..000000000 --- a/zenserver-test/zenserver-test.vcxproj +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>16.0</VCProjectVersion> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{2563249e-e695-4cc4-8ffa-335d07680c9d}</ProjectGuid> - <RootNamespace>zenservertest</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_debug.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_release.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - <ProjectReference Include="..\zenhttp\zenhttp.vcxproj"> - <Project>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</Project> - </ProjectReference> - <ProjectReference Include="..\zenutil\zenutil.vcxproj"> - <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <ClCompile Include="projectclient.cpp" /> - <ClCompile Include="zenserver-test.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="projectclient.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zenserver-test/zenserver-test.vcxproj.filters b/zenserver-test/zenserver-test.vcxproj.filters deleted file mode 100644 index 59f077ab0..000000000 --- a/zenserver-test/zenserver-test.vcxproj.filters +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="zenserver-test.cpp" /> - <ClCompile Include="projectclient.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="projectclient.h" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index e4a768f7b..339afbfe5 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -34,17 +34,3 @@ target("zenserver") add_packages( "vcpkg::cxxopts", "vcpkg::mimalloc") - - on_load(function(target) - local commit, err = os.iorun("git log -1 --format=\"%h-%cI\"") - if commit ~= nil then - commit = commit:gsub("%s+", "") - commit = commit:gsub("\n", "") - if is_mode("release") then - commit = "rel-" .. commit - else - commit = "dbg-" .. commit - end - target:add("defines", "BUILD_VERSION=\"" .. commit .. "\"") - end - end) diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp index 49bb3004d..0f67e3982 100644 --- a/zenserver/zenserver.cpp +++ b/zenserver/zenserver.cpp @@ -2,6 +2,7 @@ #include <zencore/compactbinarybuilder.h> #include <zencore/compactbinaryvalidation.h> +#include <zencore/config.h> #include <zencore/filesystem.h> #include <zencore/fmtutils.h> #include <zencore/iobuffer.h> @@ -43,12 +44,6 @@ ZEN_THIRD_PARTY_INCLUDES_END #include <set> #include <unordered_map> -#if !defined(BUILD_VERSION) -# define BUILD_VERSION ("dev-build") -#endif - -#define ZEN_SCHEMA_VERSION 3 // Canged ZenCache manifest (per larsson) - ////////////////////////////////////////////////////////////////////////// // We don't have any doctest code in this file but this is needed to bring // in some shared code into the executable @@ -197,7 +192,7 @@ public: m_HealthService.SetHealthInfo({.DataRoot = m_DataRoot, .AbsLogPath = ServerOptions.AbsLogFile, .HttpServerClass = std::string(ServerOptions.HttpServerClass), - .BuildVersion = std::string(BUILD_VERSION)}); + .BuildVersion = std::string(ZEN_CFG_VERSION_BUILD_STRING_FULL)}); // Ok so now we're configured, let's kick things off @@ -611,10 +606,10 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions) const int32_t ManifestVersion = m_RootManifest["schema_version"].AsInt32(0); - if (ManifestVersion != ZEN_SCHEMA_VERSION) + if (ManifestVersion != ZEN_CFG_SCHEMA_VERSION) { WipeState = true; - WipeReason = "Manifest schema version: {}, differs from required: {}"_format(ManifestVersion, ZEN_SCHEMA_VERSION); + WipeReason = "Manifest schema version: {}, differs from required: {}"_format(ManifestVersion, ZEN_CFG_SCHEMA_VERSION); } } } @@ -656,7 +651,7 @@ ZenServer::InitializeState(const ZenServerOptions& ServerOptions) const DateTime Now = DateTime::Now(); CbObjectWriter Cbo; - Cbo << "schema_version" << ZEN_SCHEMA_VERSION << "created" << Now << "updated" << Now << "state_id" << Oid::NewOid(); + Cbo << "schema_version" << ZEN_CFG_SCHEMA_VERSION << "created" << Now << "updated" << Now << "state_id" << Oid::NewOid(); m_RootManifest = Cbo.Save(); @@ -843,7 +838,7 @@ ZenEntryPoint::Run() InitializeLogging(ServerOptions); - ZEN_INFO(ZEN_APP_NAME " - starting on port {}, build '{}'", ServerOptions.BasePort, BUILD_VERSION); + ZEN_INFO(ZEN_APP_NAME " - starting on port {}, version '{}'", ServerOptions.BasePort, ZEN_CFG_VERSION_BUILD_STRING_FULL); ZenServerState ServerState; ServerState.Initialize(); diff --git a/zenserver/zenserver.vcxproj b/zenserver/zenserver.vcxproj deleted file mode 100644 index 4b849eae8..000000000 --- a/zenserver/zenserver.vcxproj +++ /dev/null @@ -1,184 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{8398D81C-B1B6-4327-82B1-06EACB8A144F}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>zenserver</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_debug.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_release.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> - <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - <DelayLoadDLLs>projectedfslib.dll;shell32.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> - <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <DelayLoadDLLs>projectedfslib.dll;shell32.dll</DelayLoadDLLs> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="admin\admin.h" /> - <ClInclude Include="cache\cachetracking.h" /> - <ClInclude Include="cache\structuredcache.h" /> - <ClInclude Include="cache\structuredcachestore.h" /> - <ClInclude Include="compute\apply.h" /> - <ClInclude Include="config.h" /> - <ClInclude Include="diag\formatters.h" /> - <ClInclude Include="diag\logging.h" /> - <ClInclude Include="experimental\frontend.h" /> - <ClInclude Include="experimental\vfs.h" /> - <ClInclude Include="monitoring\httpstats.h" /> - <ClInclude Include="monitoring\httpstatus.h" /> - <ClInclude Include="resource.h" /> - <ClInclude Include="sos\sos.h" /> - <ClInclude Include="testing\httptest.h" /> - <ClInclude Include="upstream\jupiter.h" /> - <ClInclude Include="projectstore.h" /> - <ClInclude Include="testing\launch.h" /> - <ClInclude Include="casstore.h" /> - <ClInclude Include="diag\diagsvcs.h" /> - <ClInclude Include="experimental\usnjournal.h" /> - <ClInclude Include="targetver.h" /> - <ClInclude Include="upstream\upstreamapply.h" /> - <ClInclude Include="upstream\upstreamcache.h" /> - <ClInclude Include="upstream\zen.h" /> - <ClInclude Include="windows\service.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="admin\admin.cpp" /> - <ClCompile Include="cache\cachetracking.cpp" /> - <ClCompile Include="cache\structuredcache.cpp" /> - <ClCompile Include="cache\structuredcachestore.cpp" /> - <ClCompile Include="compute\apply.cpp" /> - <ClCompile Include="config.cpp" /> - <ClCompile Include="diag\diagsvcs.cpp" /> - <ClCompile Include="diag\logging.cpp" /> - <ClCompile Include="experimental\frontend.cpp" /> - <ClCompile Include="experimental\vfs.cpp" /> - <ClCompile Include="monitoring\httpstats.cpp" /> - <ClCompile Include="monitoring\httpstatus.cpp" /> - <ClCompile Include="projectstore.cpp" /> - <ClCompile Include="sos\sos.cpp" /> - <ClCompile Include="testing\httptest.cpp" /> - <ClCompile Include="upstream\jupiter.cpp" /> - <ClCompile Include="testing\launch.cpp" /> - <ClCompile Include="casstore.cpp" /> - <ClCompile Include="experimental\usnjournal.cpp" /> - <ClCompile Include="upstream\upstreamapply.cpp" /> - <ClCompile Include="upstream\upstreamcache.cpp" /> - <ClCompile Include="upstream\zen.cpp" /> - <ClCompile Include="windows\service.cpp" /> - <ClCompile Include="zenserver.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - <ProjectReference Include="..\zenhttp\zenhttp.vcxproj"> - <Project>{8eeb3be5-7001-46bf-aafd-edb7558ac012}</Project> - </ProjectReference> - <ProjectReference Include="..\zenstore\zenstore.vcxproj"> - <Project>{26cbbaeb-14c1-4efc-877d-80f48215651c}</Project> - </ProjectReference> - <ProjectReference Include="..\zenutil\zenutil.vcxproj"> - <Project>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="zenserver.rc" /> - </ItemGroup> - <ItemGroup> - <Image Include="..\UnrealEngine.ico" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zenserver/zenserver.vcxproj.filters b/zenserver/zenserver.vcxproj.filters deleted file mode 100644 index 9b248a38b..000000000 --- a/zenserver/zenserver.vcxproj.filters +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="targetver.h" /> - <ClInclude Include="projectstore.h" /> - <ClInclude Include="casstore.h" /> - <ClInclude Include="testing\launch.h" /> - <ClInclude Include="diag\diagsvcs.h"> - <Filter>diag</Filter> - </ClInclude> - <ClInclude Include="admin\admin.h"> - <Filter>admin</Filter> - </ClInclude> - <ClInclude Include="experimental\usnjournal.h"> - <Filter>experimental</Filter> - </ClInclude> - <ClInclude Include="upstream\jupiter.h"> - <Filter>upstream</Filter> - </ClInclude> - <ClInclude Include="upstream\zen.h"> - <Filter>upstream</Filter> - </ClInclude> - <ClInclude Include="cache\structuredcache.h"> - <Filter>cache</Filter> - </ClInclude> - <ClInclude Include="config.h" /> - <ClInclude Include="diag\logging.h" /> - <ClInclude Include="cache\structuredcachestore.h" /> - <ClInclude Include="compute\apply.h" /> - <ClInclude Include="sos\sos.h" /> - <ClInclude Include="upstream\upstreamcache.h"> - <Filter>upstream</Filter> - </ClInclude> - <ClInclude Include="testing\httptest.h" /> - <ClInclude Include="windows\service.h" /> - <ClInclude Include="resource.h" /> - <ClInclude Include="experimental\frontend.h"> - <Filter>experimental</Filter> - </ClInclude> - <ClInclude Include="diag\formatters.h" /> - <ClInclude Include="experimental\vfs.h" /> - <ClInclude Include="monitoring\httpstats.h" /> - <ClInclude Include="monitoring\httpstatus.h" /> - <ClInclude Include="upstream\upstreamapply.h"> - <Filter>upstream</Filter> - </ClInclude> - <ClInclude Include="cache\cachetracking.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="zenserver.cpp" /> - <ClCompile Include="projectstore.cpp" /> - <ClCompile Include="casstore.cpp" /> - <ClCompile Include="experimental\usnjournal.cpp"> - <Filter>experimental</Filter> - </ClCompile> - <ClCompile Include="testing\launch.cpp" /> - <ClCompile Include="upstream\jupiter.cpp"> - <Filter>upstream</Filter> - </ClCompile> - <ClCompile Include="upstream\zen.cpp"> - <Filter>upstream</Filter> - </ClCompile> - <ClCompile Include="cache\structuredcache.cpp"> - <Filter>cache</Filter> - </ClCompile> - <ClCompile Include="config.cpp" /> - <ClCompile Include="diag\logging.cpp" /> - <ClCompile Include="cache\structuredcachestore.cpp" /> - <ClCompile Include="compute\apply.cpp" /> - <ClCompile Include="sos\sos.cpp" /> - <ClCompile Include="upstream\upstreamcache.cpp"> - <Filter>upstream</Filter> - </ClCompile> - <ClCompile Include="testing\httptest.cpp" /> - <ClCompile Include="windows\service.cpp" /> - <ClCompile Include="admin\admin.cpp" /> - <ClCompile Include="experimental\frontend.cpp"> - <Filter>experimental</Filter> - </ClCompile> - <ClCompile Include="experimental\vfs.cpp" /> - <ClCompile Include="monitoring\httpstats.cpp" /> - <ClCompile Include="monitoring\httpstatus.cpp" /> - <ClCompile Include="upstream\upstreamapply.cpp"> - <Filter>upstream</Filter> - </ClCompile> - <ClCompile Include="diag\diagsvcs.cpp"> - <Filter>diag</Filter> - </ClCompile> - <ClCompile Include="cache\cachetracking.cpp" /> - </ItemGroup> - <ItemGroup> - <Filter Include="cache"> - <UniqueIdentifier>{98e47c47-6bbe-46f5-b7cd-4b54352d964e}</UniqueIdentifier> - </Filter> - <Filter Include="diag"> - <UniqueIdentifier>{6a09a36e-fb5f-452a-ba0c-6d029240bad0}</UniqueIdentifier> - </Filter> - <Filter Include="admin"> - <UniqueIdentifier>{f72f861e-fa14-4ff8-9338-f0f84f4a8389}</UniqueIdentifier> - </Filter> - <Filter Include="experimental"> - <UniqueIdentifier>{76916270-97a6-4ec8-b323-a95b6080e245}</UniqueIdentifier> - </Filter> - <Filter Include="upstream"> - <UniqueIdentifier>{303c28c2-3607-4ef4-89bd-e3618fe37e74}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <ItemGroup> - <ResourceCompile Include="zenserver.rc" /> - </ItemGroup> - <ItemGroup> - <Image Include="..\UnrealEngine.ico" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zenstore-test/zenstore-test.vcxproj b/zenstore-test/zenstore-test.vcxproj deleted file mode 100644 index 201594a25..000000000 --- a/zenstore-test/zenstore-test.vcxproj +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>15.0</VCProjectVersion> - <ProjectGuid>{C001A3DF-B76E-4989-B576-FE2B78AB2580}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>zenstoretest</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>false</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> - <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <PrecompiledHeader>NotUsing</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <WholeProgramOptimization>false</WholeProgramOptimization> - <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - <ShowProgress>NotSet</ShowProgress> - </Link> - <ProjectReference /> - </ItemDefinitionGroup> - <ItemGroup> - <ClInclude Include="targetver.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="zenstore-test.cpp" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - <ProjectReference Include="..\zenstore\zenstore.vcxproj"> - <Project>{26cbbaeb-14c1-4efc-877d-80f48215651c}</Project> - </ProjectReference> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zenstore-test/zenstore-test.vcxproj.filters b/zenstore-test/zenstore-test.vcxproj.filters deleted file mode 100644 index 000599c79..000000000 --- a/zenstore-test/zenstore-test.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClInclude Include="targetver.h" /> - </ItemGroup> - <ItemGroup> - <ClCompile Include="zenstore-test.cpp" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zenstore/zenstore.vcxproj b/zenstore/zenstore.vcxproj deleted file mode 100644 index 77a4dff7d..000000000 --- a/zenstore/zenstore.vcxproj +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <ItemGroup> - <ClCompile Include="basicfile.cpp" /> - <ClCompile Include="CAS.cpp" /> - <ClCompile Include="caslog.cpp" /> - <ClCompile Include="cidstore.cpp" /> - <ClCompile Include="compactcas.cpp" /> - <ClCompile Include="filecas.cpp" /> - <ClCompile Include="gc.cpp" /> - <ClCompile Include="scrub.cpp" /> - <ClCompile Include="zenstore.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="compactcas.h" /> - <ClInclude Include="filecas.h" /> - <ClInclude Include="include\zenstore\basicfile.h" /> - <ClInclude Include="include\zenstore\cidstore.h" /> - <ClInclude Include="include\zenstore\gc.h" /> - <ClInclude Include="include\zenstore\scrub.h" /> - <ClInclude Include="include\zenstore\cas.h" /> - <ClInclude Include="include\zenstore\caslog.h" /> - <ClInclude Include="include\zenstore\zenstore.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>16.0</VCProjectVersion> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{26cbbaeb-14c1-4efc-877d-80f48215651c}</ProjectGuid> - <RootNamespace>zenstore</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_debug.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zenfs_common.props" /> - <Import Project="..\zen_base_release.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>./include</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem> - </SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile> - <AdditionalIncludeDirectories>./include</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem> - </SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zenstore/zenstore.vcxproj.filters b/zenstore/zenstore.vcxproj.filters deleted file mode 100644 index 904de0748..000000000 --- a/zenstore/zenstore.vcxproj.filters +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="CAS.cpp" /> - <ClCompile Include="caslog.cpp" /> - <ClCompile Include="compactcas.cpp" /> - <ClCompile Include="filecas.cpp" /> - <ClCompile Include="gc.cpp" /> - <ClCompile Include="scrub.cpp" /> - <ClCompile Include="basicfile.cpp" /> - <ClCompile Include="cidstore.cpp" /> - <ClCompile Include="zenstore.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="compactcas.h" /> - <ClInclude Include="filecas.h" /> - <ClInclude Include="include\zenstore\cas.h" /> - <ClInclude Include="include\zenstore\caslog.h" /> - <ClInclude Include="include\zenstore\gc.h" /> - <ClInclude Include="include\zenstore\scrub.h" /> - <ClInclude Include="include\zenstore\basicfile.h" /> - <ClInclude Include="include\zenstore\cidstore.h" /> - <ClInclude Include="include\zenstore\zenstore.h" /> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zentest-appstub/zentest-appstub.vcxproj b/zentest-appstub/zentest-appstub.vcxproj deleted file mode 100644 index 16767f418..000000000 --- a/zentest-appstub/zentest-appstub.vcxproj +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>16.0</VCProjectVersion> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{7ffc7e77-d038-44e9-8d84-41918c355f29}</ProjectGuid> - <RootNamespace>zentestappstub</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="zentest-appstub.cpp" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zentest-appstub/zentest-appstub.vcxproj.filters b/zentest-appstub/zentest-appstub.vcxproj.filters deleted file mode 100644 index 23c71deb6..000000000 --- a/zentest-appstub/zentest-appstub.vcxproj.filters +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="zentest-appstub.cpp" /> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/zenutil/zenutil.vcxproj b/zenutil/zenutil.vcxproj deleted file mode 100644 index e0c034c6f..000000000 --- a/zenutil/zenutil.vcxproj +++ /dev/null @@ -1,119 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|x64"> - <Configuration>Debug</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <VCProjectVersion>16.0</VCProjectVersion> - <Keyword>Win32Proj</Keyword> - <ProjectGuid>{77f8315d-b21d-4db0-9a6f-2d3359f88a70}</ProjectGuid> - <RootNamespace>zenutil</RootNamespace> - <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>StaticLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="Shared"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zen_base_debug.props" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - <Import Project="..\zen_base_release.props" /> - <Import Project="..\zenfs_common.props" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <LinkIncremental>true</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>false</LinkIncremental> - <PublicIncludeDirectories>$(ProjectDir)include;$(PublicIncludeDirectories)</PublicIncludeDirectories> - </PropertyGroup> - <PropertyGroup Label="Vcpkg"> - <VcpkgEnableManifest>true</VcpkgEnableManifest> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <VcpkgUseStatic>true</VcpkgUseStatic> - <VcpkgAdditionalInstallOptions>--overlay-ports=$(SolutionDir)vcpkg_overlay-ports</VcpkgAdditionalInstallOptions> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <ConformanceMode>true</ConformanceMode> - <AdditionalIncludeDirectories>.\include</AdditionalIncludeDirectories> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="cache\cachekey.cpp" /> - <ClCompile Include="cache\cachepolicy.cpp" /> - <ClCompile Include="zenserverprocess.cpp" /> - </ItemGroup> - <ItemGroup> - <ClInclude Include="include\zenutil\cache\cache.h" /> - <ClInclude Include="include\zenutil\cache\cachekey.h" /> - <ClInclude Include="include\zenutil\cache\cachepolicy.h" /> - <ClInclude Include="include\zenutil\zenserverprocess.h" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\zencore\zencore.vcxproj"> - <Project>{d75bf9ab-c61e-4fff-ad59-1563430f05e2}</Project> - </ProjectReference> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/zenutil/zenutil.vcxproj.filters b/zenutil/zenutil.vcxproj.filters deleted file mode 100644 index 368a827c2..000000000 --- a/zenutil/zenutil.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <ClCompile Include="zenserverprocess.cpp" /> - <ClCompile Include="cache\cachekey.cpp"> - <Filter>cache</Filter> - </ClCompile> - <ClCompile Include="cache\cachepolicy.cpp"> - <Filter>cache</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="include\zenutil\zenserverprocess.h" /> - <ClInclude Include="include\zenutil\cache\cache.h"> - <Filter>cache</Filter> - </ClInclude> - <ClInclude Include="include\zenutil\cache\cachekey.h"> - <Filter>cache</Filter> - </ClInclude> - <ClInclude Include="include\zenutil\cache\cachepolicy.h"> - <Filter>cache</Filter> - </ClInclude> - </ItemGroup> - <ItemGroup> - <None Include="xmake.lua" /> - </ItemGroup> - <ItemGroup> - <Filter Include="cache"> - <UniqueIdentifier>{a441c536-6a01-4ac4-85a0-2667c95027d0}</UniqueIdentifier> - </Filter> - </ItemGroup> -</Project>
\ No newline at end of file |