Merge pull request #175 from Alia5/develop

Completely rewritten shortcuts parser

.gitmodules

@@ -28,3 +28,9 @@
 [submodule "deps/traypp"]
 	path = deps/traypp
 	url = https://github.com/Soundux/traypp.git
+[submodule "deps/fifo_map"]
+	path = deps/fifo_map
+	url = [email protected]:nlohmann/fifo_map.git
+[submodule "deps/Shortcuts_VDF"]
+	path = deps/Shortcuts_VDF
+	url = [email protected]:Alia5/Shortcuts_VDF.git

GlosSIConfig/GlosSIConfig.vcxproj

@@ -63,12 +63,12 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/Zc:__cplusplus /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\deps\WinReg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\deps\WinReg;..\deps\fifo_map\src;..\deps\Shortcuts_VDF\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
       <EnableDpiAwareness>true</EnableDpiAwareness>
@@ -85,12 +85,12 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
       <AdditionalOptions>/Zc:__cplusplus  /Zc:zwoPhase-  /permissive- %(AdditionalOptions)</AdditionalOptions>
       <CompileAsWinRT>false</CompileAsWinRT>
       <PreprocessorDefinitions>NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\deps\WinReg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\deps\WinReg;..\deps\fifo_map\src;..\deps\Shortcuts_VDF\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
       <EnableDpiAwareness>true</EnableDpiAwareness>
@@ -154,7 +154,6 @@
     <ClInclude Include="ExeImageProvider.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="UWPFetch.h" />
-    <ClInclude Include="VDFParser.h" />
     <ClInclude Include="WinEventFilter.h" />
   </ItemGroup>
   <ItemGroup>

GlosSIConfig/GlosSIConfig.vcxproj.DotSettings

@@ -1,2 +1,2 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CppProjectProperties/LanguageStandard/@EntryValue">Cpp17</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CppProjectProperties/LanguageStandard/@EntryValue">Cpp20</s:String></wpf:ResourceDictionary>

GlosSIConfig/GlosSIConfig.vcxproj.filters

@@ -75,9 +75,6 @@
     <ClInclude Include="WinEventFilter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="VDFParser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="UWPFetch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -100,7 +97,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="$(SolutionDir)\GloSC_Icon.ico">
-        <Filter>Resource Files</Filter>
+      <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
 </Project>