jbeder · al-martyn1 · Apr 21, 2022 · Apr 21, 2022 · Apr 21, 2022 · Apr 21, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 build/
 /tags
 /bazel-*
+/.vs
+/.out
diff --git a/_prj_msvc/props/umba_3dp_boost.props b/_prj_msvc/props/umba_3dp_boost.props
@@ -0,0 +1,6 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <BOOST>$(BOOST_1_75_0_ROOT)</BOOST>
+    <BOOST_LIB>$(BOOST)\stage\lib</BOOST_LIB>
+  </PropertyGroup>
+</Project>
diff --git a/_prj_msvc/props/umba_3dp_jinja2cpp.props b/_prj_msvc/props/umba_3dp_jinja2cpp.props
@@ -0,0 +1,16 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- 
+      Set up user/system environment vars:
+      JINJA2CPP_BUILT_ROOT=D:\Jinja2Cpp
+    -->
+
+  <!-- umba_common.props must be included first -->
+
+  <PropertyGroup>
+    <JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT>$(JINJA2CPP_BUILT_ROOT)\$(UMBA_TOOLSET_PLATFORM_CONFIG_ROOT)</JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT>
+    <JINJA2CPP_INC>$(JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT)\include</JINJA2CPP_INC>
+    <JINJA2CPP_LIB>$(JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT)\lib;$(JINJA2CPP_TOOLSET_PLATFORM_CONFIG_ROOT)\lib\static</JINJA2CPP_LIB>
+  </PropertyGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_3dp_llvm.props b/_prj_msvc/props/umba_3dp_llvm.props
@@ -0,0 +1,45 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- 
+      Set up user/system environment vars:
+      UMBA_LLVM_PROJECT_ROOT=G:\llvm-project
+      UMBA_LLVM_BUILT_ROOT=G:\llvm
+    -->
+
+  <PropertyGroup>
+      <UMBA_LLVM_TOOLSET>$(UMBA_MSVCVER)</UMBA_LLVM_TOOLSET>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <LLVM_LIB_ROOT>$(UMBA_LLVM_BUILT_ROOT)\$(UMBA_LLVM_TOOLSET)</LLVM_LIB_ROOT>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- 
+      $(UMBA_LLVM_BUILT_ROOT) \ $(UMBA_LLVM_TOOLSET) \ $(PlatformShortName) \artifacts\tools\clang\include
+      G:\llvm                 \ msvc2019             \ x64                  \artifacts\tools\clang\include \clang\AST 
+      $(LLVM_LIB_ROOT)                               \ $(PlatformShortName) \artifacts\tools\clang\include
+      $(LLVM_LIB_ROOT)\$(UMBA_LLVM_TOOLSET)\$(PlatformShortName)\artifacts\tools\clang\include
+
+      G:\llvm-project\llvm\include\llvm\ADT\ 
+    -->
+    <UMBA_LLVM_CLANG_TOOLSET_PLATFORM_CONFIG_ARTIFACTS_INC>$(LLVM_LIB_ROOT)\$(PlatformShortName)\include;$(LLVM_LIB_ROOT)\$(PlatformShortName)\tools\clang\include</UMBA_LLVM_CLANG_TOOLSET_PLATFORM_CONFIG_ARTIFACTS_INC>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- 
+      G:\llvm-project\llvm\include\
+      G:\llvm\msvc2019\x64\artifacts\tools\clang\include   clang\AST\ 
+
+      llvm/Frontend/OpenMP/OMP.inc
+      G:\llvm\msvc2019\x64\include   llvm\Frontend\OpenMP\OMP.inc
+
+
+    -->
+    <LLVM_CLANG_INC>$(UMBA_LLVM_PROJECT_ROOT)\llvm\include;$(UMBA_LLVM_PROJECT_ROOT)\clang\include;$(UMBA_LLVM_CLANG_TOOLSET_PLATFORM_CONFIG_ARTIFACTS_INC)</LLVM_CLANG_INC>
+    <LLVM_CLANG_TOOLS_EXTRA_ROOT>$(UMBA_LLVM_PROJECT_ROOT)\clang-tools-extra</LLVM_CLANG_TOOLS_EXTRA_ROOT>
+    <LLVM_LIB>$(LLVM_LIB_ROOT)\$(PlatformShortName)\$(Configuration)\lib</LLVM_LIB>
+    <LLVM_BIN>$(LLVM_LIB_ROOT)\$(PlatformShortName)\$(Configuration)\bin</LLVM_BIN>
+  </PropertyGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_3dp_qtdir.props b/_prj_msvc/props/umba_3dp_qtdir.props
@@ -0,0 +1,51 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Condition="'$(UMBA_MSVCVER)'=='msvc2017'">
+    <UMBA_QT_ROOT>$(MSVC2017_QTROOT)\msvc2017</UMBA_QT_ROOT>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(UMBA_MSVCVER)'=='msvc2019'">
+    <UMBA_QT_ROOT>$(MSVC2019_QTROOT)\msvc2017</UMBA_QT_ROOT>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <QTDIR>$(UMBA_QT_ROOT)\msvc2017</QTDIR>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <QTDIR>$(UMBA_QT_ROOT)\msvc2017</QTDIR>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <QTDIR>$(UMBA_QT_ROOT)\msvc2017_64</QTDIR>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <QTDIR>$(UMBA_QT_ROOT)\msvc2017_64</QTDIR>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <QT_BIN_PATH>$(QTDIR)\bin</QT_BIN_PATH>
+    <QT_DLL_PATH>$(QTDIR)\bin</QT_DLL_PATH>
+    <QT_LIB_PATH>$(QTDIR)\lib</QT_LIB_PATH>
+    <QT_INC_PATH>$(QTDIR)\include</QT_INC_PATH>
+  </PropertyGroup>
+
+  <PropertyGroup>
+
+    <QWT_ROOT_PATH>$(MSVC2017_QWT_ROOT)</QWT_ROOT_PATH>
+
+    <!-- For compatibility with old version -->
+    <QWT_ROOT>$(QWT_ROOT_PATH)</QWT_ROOT>
+
+    <QWT_LIB_PATH>$(QWT_ROOT_PATH)\$(PlatformShortName)\lib</QWT_LIB_PATH>
+    <QWT_DLL_PATH>$(QWT_ROOT_PATH)\$(PlatformShortName)\lib</QWT_DLL_PATH>
+    <QWT_INC_PATH>$(QWT_ROOT_PATH)\$(PlatformShortName)\include</QWT_INC_PATH>
+
+    <!-- For compatibility with old version -->
+    <QWT_LIB>$(QWT_LIB_PATH)</QWT_LIB>
+    <QWT_INC>$(QWT_INC_PATH)</QWT_INC>
+
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <LocalDebuggerEnvironment>PATH=$(QWT_DLL_PATH);$(QT_DLL_PATH);$(PATH);$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
+  </PropertyGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_common.props b/_prj_msvc/props/umba_common.props
@@ -0,0 +1,19 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- umba_msvcver.props must be included first -->
+
+  <Import Project=".\umba_stdcpp14.props" />
+
+  <PropertyGroup>
+
+    <!-- UMBA_PLATFORM_CONFIG_ROOT: x86\Release -->
+    <!-- UMBA_PLATFORM_CONFIG_ROOT: x64\Debug -->
+    <UMBA_PLATFORM_CONFIG_ROOT>$(PlatformShortName)\$(Configuration)</UMBA_PLATFORM_CONFIG_ROOT>
+
+    <!-- UMBA_MSVC_PLATFORM_CONFIG_ROOT: msvc2019\x86\Release -->
+    <!-- UMBA_MSVC_PLATFORM_CONFIG_ROOT: msvc2019\x64\Debug -->
+    <UMBA_TOOLSET_PLATFORM_CONFIG_ROOT>$(UMBA_MSVCVER)\$(UMBA_PLATFORM_CONFIG_ROOT)</UMBA_TOOLSET_PLATFORM_CONFIG_ROOT>
+
+  </PropertyGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_config_matrix_common.props b/_prj_msvc/props/umba_config_matrix_common.props
@@ -0,0 +1,54 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>Disabled</Optimization>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>Disabled</Optimization>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat />
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>UNICODE;_UNICODE;WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+    </Link>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_config_matrix_qt.props b/_prj_msvc/props/umba_config_matrix_qt.props
@@ -0,0 +1,33 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project=".\umba_qt_common.props" />
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <QtMoc>
+      <Define>UNICODE;_UNICODE;WIN32;WIN64;%(PreprocessorDefinitions)</Define>
+      <IncludePath>%(AdditionalIncludeDirectories);$(ProjectDir)\..\..</IncludePath>
+    </QtMoc>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <QtMoc>
+      <Define>UNICODE;_UNICODE;WIN32;%(PreprocessorDefinitions)</Define>
+      <IncludePath>%(AdditionalIncludeDirectories)</IncludePath>
+    </QtMoc>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <QtMoc>
+      <Define>UNICODE;_UNICODE;WIN32;WIN64;NDEBUG;%(PreprocessorDefinitions)</Define>
+      <IncludePath>%(AdditionalIncludeDirectories)</IncludePath>
+    </QtMoc>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <QtMoc>
+      <Define>UNICODE;_UNICODE;WIN32;NDEBUG;%(PreprocessorDefinitions)</Define>
+      <IncludePath>%(AdditionalIncludeDirectories)</IncludePath>
+    </QtMoc>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_local_common_prjdirs.props b/_prj_msvc/props/umba_local_common_prjdirs.props
@@ -0,0 +1,19 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+
+    <UMBA_LOCAL_LIBS_ROOT>$(ProjectDir)\..\_libs</UMBA_LOCAL_LIBS_ROOT>
+    <UMBA_LOCAL_PRETTY_HEADERS>$(UMBA_LOCAL_LIBS_ROOT)\pretty_headers;$(UMBA_LOCAL_LIBS_ROOT)\_pretty_headers;$(UMBA_LOCAL_LIBS_ROOT)\std_headers;$(UMBA_LOCAL_LIBS_ROOT)\_std_headers;$(UMBA_LOCAL_LIBS_ROOT)\qt_headers;$(UMBA_LOCAL_LIBS_ROOT)\_qt_headers;$(UMBA_LOCAL_LIBS_ROOT)\qt5_headers;$(UMBA_LOCAL_LIBS_ROOT)\_qt5_headers;$(UMBA_LOCAL_LIBS_ROOT)\qt6_headers;$(UMBA_LOCAL_LIBS_ROOT)\_qt6_headers</UMBA_LOCAL_PRETTY_HEADERS>
+    <UMBA_LOCAL_INC_DIRS>$(UMBA_LOCAL_LIBS_ROOT);$(UMBA_LOCAL_PRETTY_HEADERS);$(ProjectDir)\..\src;$(UMBA_LOCAL_LIBS_ROOT)\sfmt\inc;$(UMBA_LOCAL_LIBS_ROOT)\mem_pools\inc</UMBA_LOCAL_INC_DIRS>
+
+    <UMBA_OUTDIR>$(SolutionDir)\.out\$(UMBA_TOOLSET_PLATFORM_CONFIG_ROOT)</UMBA_OUTDIR>
+
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutDir>$(UMBA_OUTDIR)\</OutDir>
+    <IntDir>$(UMBA_OUTDIR)\_$(ProjectName)\</IntDir>
+  </PropertyGroup>
+
+
+</Project>
diff --git a/_prj_msvc/props/umba_msvcver.props b/_prj_msvc/props/umba_msvcver.props
@@ -0,0 +1,24 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup >
+    <UMBA_MSVCVER>msvc_$(VisualStudioVersion)</UMBA_MSVCVER>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='15.0'" Label="UmbaProps">
+    <UMBA_MSVCVER>msvc2017</UMBA_MSVCVER>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <PlatformToolset>v141</PlatformToolset>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='16.0'" Label="UmbaProps">
+    <UMBA_MSVCVER>msvc2019</UMBA_MSVCVER>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(VisualStudioVersion)'=='17.0'" Label="UmbaProps">
+    <UMBA_MSVCVER>msvc2022</UMBA_MSVCVER>
+    <PlatformToolset>v143</PlatformToolset>
+  </PropertyGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_project_configurations.props b/_prj_msvc/props/umba_project_configurations.props
@@ -0,0 +1,37 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemGroup Label="ProjectConfigurations">
+
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+
+    <ProjectConfiguration Include="RelWithDebInfo|Win32">
+      <Configuration>RelWithDebInfo</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+
+    <ProjectConfiguration Include="MinSizeRel|x64">
+      <Configuration>MinSizeRel</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+
+  </ItemGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_qt_common.props b/_prj_msvc/props/umba_qt_common.props
@@ -0,0 +1,19 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project=".\umba_3dp_qtdir.props" />
+
+  <PropertyGroup>
+      <QT_GENERATED_PATH>$(UMBA_OUTDIR)\_$(ProjectName)\GeneratedFiles</QT_GENERATED_PATH>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(QT_GENERATED_PATH);$(QT_INC_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <QtMoc>
+      <Define>STRICT;WIN32_LEAN_AND_MEAN;USE_UMBA_LOUT_COUT;%(PreprocessorDefinitions)</Define>
+      <IncludePath>$(UMBA_INC_DIRS);$(QT_GENERATED_PATH);$(QT_INC_PATH);%(AdditionalIncludeDirectories)</IncludePath>
+    </QtMoc>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_stdcpp14.props b/_prj_msvc/props/umba_stdcpp14.props
@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <LanguageStandard>stdcpp14</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_stdcpp17.props b/_prj_msvc/props/umba_stdcpp17.props
@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_stdcpp20.props b/_prj_msvc/props/umba_stdcpp20.props
@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+</Project>
diff --git a/_prj_msvc/props/umba_target_console.props b/_prj_msvc/props/umba_target_console.props
@@ -0,0 +1,19 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>USE_UMBA_LOUT_COUT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+
+</Project>