diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj index 81944d09..1a6b4f7d 100644 --- a/r5dev/vproj/clientsdk.vcxproj +++ b/r5dev/vproj/clientsdk.vcxproj @@ -411,6 +411,7 @@ <ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h" /> <ClInclude Include="..\thirdparty\nlohmann\adl_serializer.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\from_json.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\to_chars.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\to_json.hpp" /> @@ -438,6 +439,7 @@ <ClInclude Include="..\thirdparty\nlohmann\detail\meta\detected.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\identity_tag.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\type_traits.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\void_t.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\output\binary_writer.hpp" /> @@ -690,7 +692,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard_C>stdc17</LanguageStandard_C> <AdditionalOptions>/D GAMESDK /D CLIENT_DLL /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -732,7 +734,7 @@ </CreateHotpatchableImage> <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalOptions>/D GAMESDK /D CLIENT_DLL /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters index 58ea7472..68612e37 100644 --- a/r5dev/vproj/clientsdk.vcxproj.filters +++ b/r5dev/vproj/clientsdk.vcxproj.filters @@ -2006,6 +2006,12 @@ <ClInclude Include="..\thirdparty\nlohmann\thirdparty\hedley\hedley_undef.hpp"> <Filter>thirdparty\nlohmann\thirdparty\hedley</Filter> </ClInclude> + <ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp"> + <Filter>thirdparty\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp"> + <Filter>thirdparty\nlohmann\detail\meta</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Image Include="..\shared\resource\lockedserver.png"> diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj index b37c30ac..87b30bf0 100644 --- a/r5dev/vproj/dedicated.vcxproj +++ b/r5dev/vproj/dedicated.vcxproj @@ -70,7 +70,7 @@ <PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile> <LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard_C>stdc17</LanguageStandard_C> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -104,7 +104,7 @@ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> <LanguageStandard_C>stdc17</LanguageStandard_C> <OmitFramePointers>false</OmitFramePointers> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -334,6 +334,7 @@ <ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h" /> <ClInclude Include="..\thirdparty\nlohmann\adl_serializer.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\from_json.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\to_chars.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\to_json.hpp" /> @@ -361,6 +362,7 @@ <ClInclude Include="..\thirdparty\nlohmann\detail\meta\detected.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\identity_tag.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\type_traits.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\void_t.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\output\binary_writer.hpp" /> diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters index 1e17005a..770f43e9 100644 --- a/r5dev/vproj/dedicated.vcxproj.filters +++ b/r5dev/vproj/dedicated.vcxproj.filters @@ -1389,6 +1389,12 @@ <ClInclude Include="..\thirdparty\nlohmann\thirdparty\hedley\hedley_undef.hpp"> <Filter>thirdparty\nlohmann\thirdparty\hedley</Filter> </ClInclude> + <ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp"> + <Filter>thirdparty\nlohmann\detail</Filter> + </ClInclude> + <ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp"> + <Filter>thirdparty\nlohmann\detail\meta</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\common\opcodes.cpp"> diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj index bacc5de5..5f860157 100644 --- a/r5dev/vproj/gamesdk.vcxproj +++ b/r5dev/vproj/gamesdk.vcxproj @@ -466,6 +466,7 @@ <ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h" /> <ClInclude Include="..\thirdparty\nlohmann\adl_serializer.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\byte_container_with_subtype.hpp" /> + <ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\from_json.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\to_chars.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\conversions\to_json.hpp" /> @@ -493,6 +494,7 @@ <ClInclude Include="..\thirdparty\nlohmann\detail\meta\detected.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\identity_tag.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\is_sax.hpp" /> + <ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\type_traits.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\meta\void_t.hpp" /> <ClInclude Include="..\thirdparty\nlohmann\detail\output\binary_writer.hpp" /> @@ -744,7 +746,7 @@ <LanguageStandard>stdcpp17</LanguageStandard> <LanguageStandard_C>stdc17</LanguageStandard_C> <AdditionalOptions>/D GAMESDK /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -786,7 +788,7 @@ </CreateHotpatchableImage> <WholeProgramOptimization>true</WholeProgramOptimization> <AdditionalOptions>/D GAMESDK /D _CRT_SECURE_NO_WARNINGS /D CURL_STATICLIB %(AdditionalOptions)</AdditionalOptions> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\;$(SolutionDir)r5dev\thirdparty\recast\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters index f0d83e9e..fa7647df 100644 --- a/r5dev/vproj/gamesdk.vcxproj.filters +++ b/r5dev/vproj/gamesdk.vcxproj.filters @@ -2177,6 +2177,12 @@ <ClInclude Include="..\thirdparty\nlohmann\thirdparty\hedley\hedley_undef.hpp"> <Filter>thirdparty\nlohmann\thirdparty\hedley</Filter> </ClInclude> + <ClInclude Include="..\thirdparty\nlohmann\detail\meta\std_fs.hpp"> + <Filter>thirdparty\nlohmann\detail\meta</Filter> + </ClInclude> + <ClInclude Include="..\thirdparty\nlohmann\detail\abi_macros.hpp"> + <Filter>thirdparty\nlohmann\detail</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <Image Include="..\shared\resource\lockedserver.png"> diff --git a/r5dev/vproj/pluginsdk.vcxproj b/r5dev/vproj/pluginsdk.vcxproj index 8736182f..f91d4885 100644 --- a/r5dev/vproj/pluginsdk.vcxproj +++ b/r5dev/vproj/pluginsdk.vcxproj @@ -69,7 +69,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile> <AdditionalOptions>/D PLUGINSDK /D _CRT_SECURE_NO_WARNINGS</AdditionalOptions> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -93,7 +93,7 @@ <PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile> <AdditionalOptions>/D PLUGINSDK /D _CRT_SECURE_NO_WARNINGS</AdditionalOptions> - <AdditionalIncludeDirectories>$(SolutionDir)r5dev\</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(SolutionDir)r5dev\;$(SolutionDir)r5dev\thirdparty\</AdditionalIncludeDirectories> </ClCompile> <Link> <SubSystem>Console</SubSystem>