Updated project language to C++20, Added base64-aklomp, tobiaslocker,…

… and base64cpp on Windows
gaspardpetit · Jun 7, 2024 · 02aeda3 · 02aeda3
1 parent 724faa9
commit 02aeda3
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 2 deletions.
diff --git a/build/msvc/base64.vcxproj b/build/msvc/base64.vcxproj
@@ -109,10 +109,14 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <IntrinsicFunctions>true</IntrinsicFunctions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>..\..\libs\base64-aklomp\out\build\x64-Release\base64.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -122,12 +126,15 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>..\..\libs\base64-aklomp\out\build\x64-Release\base64.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -139,12 +146,16 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>..\..\libs\base64-aklomp\out\build\x64-Release\base64.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -156,22 +167,34 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
+      <AdditionalDependencies>..\..\libs\base64-aklomp\out\build\x64-Release\base64.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\libs\base64pp\base64pp\base64pp.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\libs\base64pp\base64pp\include;..\..\libs\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\libs\base64pp\base64pp\include;..\..\libs\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\libs\base64pp\base64pp\include;..\..\libs\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\libs\base64pp\base64pp\include;..\..\libs\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
     <ClCompile Include="..\..\libs\chromium\modp_b64\modp_b64.cc" />
     <ClCompile Include="..\..\src\adition\adition.cpp" />
     <ClCompile Include="..\..\src\adition\test_adition.cpp" />
     <ClCompile Include="..\..\src\adp-gmbh.ch\test_adp-gmbh.cpp" />
     <ClCompile Include="..\..\src\apache\test_apache.cpp" />
     <ClCompile Include="..\..\src\arduino\test_arduino.cpp" />
+    <ClCompile Include="..\..\src\base64-aklomp\test_base64-aklomp.cpp" />
+    <ClCompile Include="..\..\src\base64-tl\test_base64-tl.cpp" />
+    <ClCompile Include="..\..\src\base64pp\test_base64pp.cpp" />
     <ClCompile Include="..\..\src\Base64SurveyBenchmark.cpp" />
     <ClCompile Include="..\..\src\Base64SurveyRepoort.cpp" />
     <ClCompile Include="..\..\src\Base64SurveyRegistry.cpp" />

diff --git a/build/msvc/base64.vcxproj.filters b/build/msvc/base64.vcxproj.filters
@@ -83,6 +83,15 @@
     <Filter Include="impl\IMUtility">
       <UniqueIdentifier>{ee2dde68-e341-4cca-aa30-e903808a5b15}</UniqueIdentifier>
     </Filter>
+    <Filter Include="impl\base64-aklomp">
+      <UniqueIdentifier>{5c019b3b-715c-4834-afd0-d7b4fb03dafe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="impl\base64-tl">
+      <UniqueIdentifier>{2285549c-17c7-469f-a24d-e797e1583826}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="impl\base64pp">
+      <UniqueIdentifier>{8e03b2f0-3dd5-427a-a052-b36af04b0678}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\adp-gmbh.ch\test_adp-gmbh.cpp">
@@ -208,6 +217,18 @@
     <ClCompile Include="..\..\src\IMUtility\test_polfosol_imutility.cpp">
       <Filter>impl\IMUtility</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\base64-aklomp\test_base64-aklomp.cpp">
+      <Filter>impl\base64-aklomp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\base64-tl\test_base64-tl.cpp">
+      <Filter>impl\base64-tl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\base64pp\test_base64pp.cpp">
+      <Filter>impl\base64pp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\libs\base64pp\base64pp\base64pp.cpp">
+      <Filter>impl\base64pp</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\libcurl\curl_base64.h">

diff --git a/src/base64-aklomp/test_base64-aklomp.cpp b/src/base64-aklomp/test_base64-aklomp.cpp
@@ -1,7 +1,11 @@
 #include "../Base64SurveyRegistry.hpp"
 #include <gtest/gtest.h>
+#define BASE64_STATIC_DEFINE
 #include "../libs/base64-aklomp/include/libbase64.h"
 
+/**
+* On Windows, to make sure to first build libs\base64-aklomp as a Visual Studio 2022 Cmake project to generate base64.lib under libs\base64-aklomp\out\build\x64-Release
+**/
 
 struct base64aklomp
 {