Added preprocessing config file and removed Visual Studio files.

5 files changed, 19 insertions, 292 deletions

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