From 9f428f156717197d270e8606bac87918b44a9911 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Thu, 6 Apr 2023 23:50:48 +0200 Subject: [PATCH] Move tier0 lib headers to public This commit does not change any logic or behavior of the code. --- r5dev/{ => public}/tier0/annotations.h | 0 r5dev/{ => public}/tier0/basetypes.h | 0 r5dev/{ => public}/tier0/commonmacros.h | 0 r5dev/{ => public}/tier0/dbg.h | 0 r5dev/{ => public}/tier0/dbgflag.h | 0 r5dev/{ => public}/tier0/fasttimer.h | 0 r5dev/{ => public}/tier0/frametask.h | 0 r5dev/{ => public}/tier0/jobthread.h | 0 r5dev/{ => public}/tier0/memalloc.h | 0 r5dev/{ => public}/tier0/platform.h | 0 r5dev/{ => public}/tier0/platform_internal.h | 0 r5dev/{ => public}/tier0/threadtools.h | 0 r5dev/{ => public}/tier0/tslist.h | 0 r5dev/{ => public}/tier0/valve_off.h | 0 r5dev/{ => public}/tier0/valve_on.h | 0 r5dev/{ => public}/tier0/wchartypes.h | 0 r5dev/{ => public}/tier1/NetAdr.h | 0 r5dev/{ => public}/tier1/NetKey.h | 0 r5dev/{ => public}/tier1/bitbuf.h | 0 r5dev/{ => public}/tier1/byteswap.h | 0 r5dev/{ => public}/tier1/characterset.h | 0 r5dev/{ => public}/tier1/cmd.h | 0 r5dev/{ => public}/tier1/cvar.h | 0 r5dev/{ => public}/tier1/generichash.h | 0 r5dev/{ => public}/tier1/mempool.h | 0 r5dev/{ => public}/tier1/memstack.h | 0 r5dev/{ => public}/tier1/stringpool.h | 0 r5dev/{ => public}/tier1/strtools.h | 0 r5dev/{ => public}/tier1/utlblockmemory.h | 0 r5dev/{ => public}/tier1/utlbuffer.h | 0 r5dev/{ => public}/tier1/utldict.h | 0 r5dev/{ => public}/tier1/utlfixedmemory.h | 0 r5dev/{ => public}/tier1/utllinkedlist.h | 0 r5dev/{ => public}/tier1/utlmap.h | 0 r5dev/{ => public}/tier1/utlmemory.h | 0 r5dev/{ => public}/tier1/utlrbtree.h | 0 r5dev/{ => public}/tier1/utlstring.h | 0 r5dev/{ => public}/tier1/utlsymbol.h | 0 r5dev/{ => public}/tier1/utlvector.h | 0 r5dev/{ => public}/tier2/curlutils.h | 0 r5dev/{ => public}/tier2/meshutils.h | 0 r5dev/{ => public}/tier2/renderutils.h | 0 r5dev/{ => public}/tier2/socketcreator.h | 0 r5dev/tier0/threadtools.cpp | 2 +- r5dev/tier1/NetAdr.cpp | 4 +- r5dev/tier1/NetKey.cpp | 2 +- r5dev/tier1/characterset.cpp | 2 +- r5dev/tier1/splitstring.cpp | 4 +- r5dev/tier2/curlutils.cpp | 2 +- r5dev/vproj/clientsdk.vcxproj | 83 +++--- r5dev/vproj/clientsdk.vcxproj.filters | 252 ++++++++++--------- r5dev/vproj/dedicated.vcxproj | 81 +++--- r5dev/vproj/dedicated.vcxproj.filters | 246 ++++++++++-------- r5dev/vproj/gamesdk.vcxproj | 82 +++--- r5dev/vproj/gamesdk.vcxproj.filters | 249 +++++++++--------- r5dev/vproj/netconsole.vcxproj | 18 +- r5dev/vproj/netconsole.vcxproj.filters | 27 +- r5dev/vproj/pluginsdk.vcxproj | 6 +- 58 files changed, 571 insertions(+), 489 deletions(-) rename r5dev/{ => public}/tier0/annotations.h (100%) rename r5dev/{ => public}/tier0/basetypes.h (100%) rename r5dev/{ => public}/tier0/commonmacros.h (100%) rename r5dev/{ => public}/tier0/dbg.h (100%) rename r5dev/{ => public}/tier0/dbgflag.h (100%) rename r5dev/{ => public}/tier0/fasttimer.h (100%) rename r5dev/{ => public}/tier0/frametask.h (100%) rename r5dev/{ => public}/tier0/jobthread.h (100%) rename r5dev/{ => public}/tier0/memalloc.h (100%) rename r5dev/{ => public}/tier0/platform.h (100%) rename r5dev/{ => public}/tier0/platform_internal.h (100%) rename r5dev/{ => public}/tier0/threadtools.h (100%) rename r5dev/{ => public}/tier0/tslist.h (100%) rename r5dev/{ => public}/tier0/valve_off.h (100%) rename r5dev/{ => public}/tier0/valve_on.h (100%) rename r5dev/{ => public}/tier0/wchartypes.h (100%) rename r5dev/{ => public}/tier1/NetAdr.h (100%) rename r5dev/{ => public}/tier1/NetKey.h (100%) rename r5dev/{ => public}/tier1/bitbuf.h (100%) rename r5dev/{ => public}/tier1/byteswap.h (100%) rename r5dev/{ => public}/tier1/characterset.h (100%) rename r5dev/{ => public}/tier1/cmd.h (100%) rename r5dev/{ => public}/tier1/cvar.h (100%) rename r5dev/{ => public}/tier1/generichash.h (100%) rename r5dev/{ => public}/tier1/mempool.h (100%) rename r5dev/{ => public}/tier1/memstack.h (100%) rename r5dev/{ => public}/tier1/stringpool.h (100%) rename r5dev/{ => public}/tier1/strtools.h (100%) rename r5dev/{ => public}/tier1/utlblockmemory.h (100%) rename r5dev/{ => public}/tier1/utlbuffer.h (100%) rename r5dev/{ => public}/tier1/utldict.h (100%) rename r5dev/{ => public}/tier1/utlfixedmemory.h (100%) rename r5dev/{ => public}/tier1/utllinkedlist.h (100%) rename r5dev/{ => public}/tier1/utlmap.h (100%) rename r5dev/{ => public}/tier1/utlmemory.h (100%) rename r5dev/{ => public}/tier1/utlrbtree.h (100%) rename r5dev/{ => public}/tier1/utlstring.h (100%) rename r5dev/{ => public}/tier1/utlsymbol.h (100%) rename r5dev/{ => public}/tier1/utlvector.h (100%) rename r5dev/{ => public}/tier2/curlutils.h (100%) rename r5dev/{ => public}/tier2/meshutils.h (100%) rename r5dev/{ => public}/tier2/renderutils.h (100%) rename r5dev/{ => public}/tier2/socketcreator.h (100%) diff --git a/r5dev/tier0/annotations.h b/r5dev/public/tier0/annotations.h similarity index 100% rename from r5dev/tier0/annotations.h rename to r5dev/public/tier0/annotations.h diff --git a/r5dev/tier0/basetypes.h b/r5dev/public/tier0/basetypes.h similarity index 100% rename from r5dev/tier0/basetypes.h rename to r5dev/public/tier0/basetypes.h diff --git a/r5dev/tier0/commonmacros.h b/r5dev/public/tier0/commonmacros.h similarity index 100% rename from r5dev/tier0/commonmacros.h rename to r5dev/public/tier0/commonmacros.h diff --git a/r5dev/tier0/dbg.h b/r5dev/public/tier0/dbg.h similarity index 100% rename from r5dev/tier0/dbg.h rename to r5dev/public/tier0/dbg.h diff --git a/r5dev/tier0/dbgflag.h b/r5dev/public/tier0/dbgflag.h similarity index 100% rename from r5dev/tier0/dbgflag.h rename to r5dev/public/tier0/dbgflag.h diff --git a/r5dev/tier0/fasttimer.h b/r5dev/public/tier0/fasttimer.h similarity index 100% rename from r5dev/tier0/fasttimer.h rename to r5dev/public/tier0/fasttimer.h diff --git a/r5dev/tier0/frametask.h b/r5dev/public/tier0/frametask.h similarity index 100% rename from r5dev/tier0/frametask.h rename to r5dev/public/tier0/frametask.h diff --git a/r5dev/tier0/jobthread.h b/r5dev/public/tier0/jobthread.h similarity index 100% rename from r5dev/tier0/jobthread.h rename to r5dev/public/tier0/jobthread.h diff --git a/r5dev/tier0/memalloc.h b/r5dev/public/tier0/memalloc.h similarity index 100% rename from r5dev/tier0/memalloc.h rename to r5dev/public/tier0/memalloc.h diff --git a/r5dev/tier0/platform.h b/r5dev/public/tier0/platform.h similarity index 100% rename from r5dev/tier0/platform.h rename to r5dev/public/tier0/platform.h diff --git a/r5dev/tier0/platform_internal.h b/r5dev/public/tier0/platform_internal.h similarity index 100% rename from r5dev/tier0/platform_internal.h rename to r5dev/public/tier0/platform_internal.h diff --git a/r5dev/tier0/threadtools.h b/r5dev/public/tier0/threadtools.h similarity index 100% rename from r5dev/tier0/threadtools.h rename to r5dev/public/tier0/threadtools.h diff --git a/r5dev/tier0/tslist.h b/r5dev/public/tier0/tslist.h similarity index 100% rename from r5dev/tier0/tslist.h rename to r5dev/public/tier0/tslist.h diff --git a/r5dev/tier0/valve_off.h b/r5dev/public/tier0/valve_off.h similarity index 100% rename from r5dev/tier0/valve_off.h rename to r5dev/public/tier0/valve_off.h diff --git a/r5dev/tier0/valve_on.h b/r5dev/public/tier0/valve_on.h similarity index 100% rename from r5dev/tier0/valve_on.h rename to r5dev/public/tier0/valve_on.h diff --git a/r5dev/tier0/wchartypes.h b/r5dev/public/tier0/wchartypes.h similarity index 100% rename from r5dev/tier0/wchartypes.h rename to r5dev/public/tier0/wchartypes.h diff --git a/r5dev/tier1/NetAdr.h b/r5dev/public/tier1/NetAdr.h similarity index 100% rename from r5dev/tier1/NetAdr.h rename to r5dev/public/tier1/NetAdr.h diff --git a/r5dev/tier1/NetKey.h b/r5dev/public/tier1/NetKey.h similarity index 100% rename from r5dev/tier1/NetKey.h rename to r5dev/public/tier1/NetKey.h diff --git a/r5dev/tier1/bitbuf.h b/r5dev/public/tier1/bitbuf.h similarity index 100% rename from r5dev/tier1/bitbuf.h rename to r5dev/public/tier1/bitbuf.h diff --git a/r5dev/tier1/byteswap.h b/r5dev/public/tier1/byteswap.h similarity index 100% rename from r5dev/tier1/byteswap.h rename to r5dev/public/tier1/byteswap.h diff --git a/r5dev/tier1/characterset.h b/r5dev/public/tier1/characterset.h similarity index 100% rename from r5dev/tier1/characterset.h rename to r5dev/public/tier1/characterset.h diff --git a/r5dev/tier1/cmd.h b/r5dev/public/tier1/cmd.h similarity index 100% rename from r5dev/tier1/cmd.h rename to r5dev/public/tier1/cmd.h diff --git a/r5dev/tier1/cvar.h b/r5dev/public/tier1/cvar.h similarity index 100% rename from r5dev/tier1/cvar.h rename to r5dev/public/tier1/cvar.h diff --git a/r5dev/tier1/generichash.h b/r5dev/public/tier1/generichash.h similarity index 100% rename from r5dev/tier1/generichash.h rename to r5dev/public/tier1/generichash.h diff --git a/r5dev/tier1/mempool.h b/r5dev/public/tier1/mempool.h similarity index 100% rename from r5dev/tier1/mempool.h rename to r5dev/public/tier1/mempool.h diff --git a/r5dev/tier1/memstack.h b/r5dev/public/tier1/memstack.h similarity index 100% rename from r5dev/tier1/memstack.h rename to r5dev/public/tier1/memstack.h diff --git a/r5dev/tier1/stringpool.h b/r5dev/public/tier1/stringpool.h similarity index 100% rename from r5dev/tier1/stringpool.h rename to r5dev/public/tier1/stringpool.h diff --git a/r5dev/tier1/strtools.h b/r5dev/public/tier1/strtools.h similarity index 100% rename from r5dev/tier1/strtools.h rename to r5dev/public/tier1/strtools.h diff --git a/r5dev/tier1/utlblockmemory.h b/r5dev/public/tier1/utlblockmemory.h similarity index 100% rename from r5dev/tier1/utlblockmemory.h rename to r5dev/public/tier1/utlblockmemory.h diff --git a/r5dev/tier1/utlbuffer.h b/r5dev/public/tier1/utlbuffer.h similarity index 100% rename from r5dev/tier1/utlbuffer.h rename to r5dev/public/tier1/utlbuffer.h diff --git a/r5dev/tier1/utldict.h b/r5dev/public/tier1/utldict.h similarity index 100% rename from r5dev/tier1/utldict.h rename to r5dev/public/tier1/utldict.h diff --git a/r5dev/tier1/utlfixedmemory.h b/r5dev/public/tier1/utlfixedmemory.h similarity index 100% rename from r5dev/tier1/utlfixedmemory.h rename to r5dev/public/tier1/utlfixedmemory.h diff --git a/r5dev/tier1/utllinkedlist.h b/r5dev/public/tier1/utllinkedlist.h similarity index 100% rename from r5dev/tier1/utllinkedlist.h rename to r5dev/public/tier1/utllinkedlist.h diff --git a/r5dev/tier1/utlmap.h b/r5dev/public/tier1/utlmap.h similarity index 100% rename from r5dev/tier1/utlmap.h rename to r5dev/public/tier1/utlmap.h diff --git a/r5dev/tier1/utlmemory.h b/r5dev/public/tier1/utlmemory.h similarity index 100% rename from r5dev/tier1/utlmemory.h rename to r5dev/public/tier1/utlmemory.h diff --git a/r5dev/tier1/utlrbtree.h b/r5dev/public/tier1/utlrbtree.h similarity index 100% rename from r5dev/tier1/utlrbtree.h rename to r5dev/public/tier1/utlrbtree.h diff --git a/r5dev/tier1/utlstring.h b/r5dev/public/tier1/utlstring.h similarity index 100% rename from r5dev/tier1/utlstring.h rename to r5dev/public/tier1/utlstring.h diff --git a/r5dev/tier1/utlsymbol.h b/r5dev/public/tier1/utlsymbol.h similarity index 100% rename from r5dev/tier1/utlsymbol.h rename to r5dev/public/tier1/utlsymbol.h diff --git a/r5dev/tier1/utlvector.h b/r5dev/public/tier1/utlvector.h similarity index 100% rename from r5dev/tier1/utlvector.h rename to r5dev/public/tier1/utlvector.h diff --git a/r5dev/tier2/curlutils.h b/r5dev/public/tier2/curlutils.h similarity index 100% rename from r5dev/tier2/curlutils.h rename to r5dev/public/tier2/curlutils.h diff --git a/r5dev/tier2/meshutils.h b/r5dev/public/tier2/meshutils.h similarity index 100% rename from r5dev/tier2/meshutils.h rename to r5dev/public/tier2/meshutils.h diff --git a/r5dev/tier2/renderutils.h b/r5dev/public/tier2/renderutils.h similarity index 100% rename from r5dev/tier2/renderutils.h rename to r5dev/public/tier2/renderutils.h diff --git a/r5dev/tier2/socketcreator.h b/r5dev/public/tier2/socketcreator.h similarity index 100% rename from r5dev/tier2/socketcreator.h rename to r5dev/public/tier2/socketcreator.h diff --git a/r5dev/tier0/threadtools.cpp b/r5dev/tier0/threadtools.cpp index 6955b963..61680972 100644 --- a/r5dev/tier0/threadtools.cpp +++ b/r5dev/tier0/threadtools.cpp @@ -7,7 +7,7 @@ //===========================================================================// #include "core/stdafx.h" -#include "threadtools.h" +#include "tier0/threadtools.h" int32 ThreadInterlockedCompareExchange(LONG volatile* pDest, int32 value, int32 comperand) { diff --git a/r5dev/tier1/NetAdr.cpp b/r5dev/tier1/NetAdr.cpp index 078ac957..17189302 100644 --- a/r5dev/tier1/NetAdr.cpp +++ b/r5dev/tier1/NetAdr.cpp @@ -6,8 +6,8 @@ #include "core/stdafx.h" #include "tier1/netadr.h" +#include "tier1/strtools.h" #include "mathlib/swap.h" -#include "strtools.h" ////////////////////////////////////////////////////////////////////// // Constructors. @@ -31,7 +31,7 @@ CNetAdr::CNetAdr(const char* pch) const char* CNetAdr::ToString(bool bOnlyBase) const { // Select a static buffer. - static char s[4][128]{}; + static char s[4][128]; static int slot = 0; int useSlot = (slot++) % 4; diff --git a/r5dev/tier1/NetKey.cpp b/r5dev/tier1/NetKey.cpp index 917cae99..3309e3c7 100644 --- a/r5dev/tier1/NetKey.cpp +++ b/r5dev/tier1/NetKey.cpp @@ -4,7 +4,7 @@ // -------------------------------------------------------------------------- //===========================================================================// #include "core/stdafx.h" -#include "NetKey.h" +#include "tier1/NetKey.h" ////////////////////////////////////////////////////////////////////// // Get key as Base64. diff --git a/r5dev/tier1/characterset.cpp b/r5dev/tier1/characterset.cpp index 97bb377f..b448e414 100644 --- a/r5dev/tier1/characterset.cpp +++ b/r5dev/tier1/characterset.cpp @@ -12,7 +12,7 @@ //============================================================================= #include "core/stdafx.h" -#include "characterset.h" +#include "tier1/characterset.h" // memdbgon must be the last include file in a .cpp file!!! //#include "tier0/memdbgon.h" diff --git a/r5dev/tier1/splitstring.cpp b/r5dev/tier1/splitstring.cpp index 14764b62..5f53804c 100644 --- a/r5dev/tier1/splitstring.cpp +++ b/r5dev/tier1/splitstring.cpp @@ -5,8 +5,8 @@ //================================================================================================== #include "core/stdafx.h" -#include "strtools.h" -#include "utlvector.h" +#include "tier1/strtools.h" +#include "tier1/utlvector.h" CSplitString::CSplitString() { diff --git a/r5dev/tier2/curlutils.cpp b/r5dev/tier2/curlutils.cpp index fdef7630..00a61717 100644 --- a/r5dev/tier2/curlutils.cpp +++ b/r5dev/tier2/curlutils.cpp @@ -5,7 +5,7 @@ //===========================================================================// #include "core/stdafx.h" #include "tier1/cvar.h" -#include "curlutils.h" +#include "tier2/curlutils.h" size_t CURLWriteStringCallback(char* contents, size_t size, size_t nmemb, void* userp) { diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj index 3484031a..957d56fb 100644 --- a/r5dev/vproj/clientsdk.vcxproj +++ b/r5dev/vproj/clientsdk.vcxproj @@ -148,6 +148,7 @@ + @@ -355,8 +356,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -456,51 +500,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters index 8a19b2d2..aa82d4d8 100644 --- a/r5dev/vproj/clientsdk.vcxproj.filters +++ b/r5dev/vproj/clientsdk.vcxproj.filters @@ -229,6 +229,9 @@ {f0fa0bdd-12a4-429d-910c-a0a45f71f454} + + {3a764173-162a-449c-952b-2db659cbad95} + @@ -672,6 +675,9 @@ thirdparty\imgui\misc + + sdk\tier1 + @@ -740,9 +746,6 @@ thirdparty\detours\include - - sdk\tier0 - sdk\vgui @@ -860,9 +863,6 @@ sdk\mathlib - - sdk\tier2 - sdk\mathlib @@ -1007,12 +1007,6 @@ sdk\materialsystem - - sdk\tier0 - - - sdk\tier0 - sdk\tier0 @@ -1031,15 +1025,6 @@ sdk\public - - sdk\tier1 - - - sdk\tier1 - - - sdk\tier1 - sdk\client @@ -1052,12 +1037,6 @@ sdk\filesystem - - sdk\tier1 - - - sdk\tier1 - sdk\vstdlib @@ -1076,15 +1055,9 @@ sdk\vstdlib - - sdk\tier0 - sdk\launcher - - sdk\tier0 - windows @@ -1127,15 +1100,9 @@ sdk\public - - sdk\tier0 - sdk\game\shared - - sdk\tier1 - sdk\public @@ -1280,9 +1247,6 @@ sdk\public - - sdk\tier1 - sdk\squirrel @@ -1301,27 +1265,6 @@ sdk\engine - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier1 - sdk\vpc @@ -1331,9 +1274,6 @@ sdk\mathlib - - sdk\tier0 - sdk\public @@ -1370,12 +1310,6 @@ sdk\vstdlib - - sdk\tier2 - - - sdk\tier2 - sdk\mathlib @@ -1418,21 +1352,12 @@ sdk\public - - sdk\tier1 - sdk\public sdk\public - - sdk\tier1 - - - sdk\tier0 - sdk\public @@ -1454,27 +1379,12 @@ sdk\public\utility - - sdk\tier1 - - - sdk\tier1 - - - sdk\tier1 - sdk\public sdk\public - - sdk\tier0 - - - sdk\tier1 - sdk\vstdlib @@ -1493,9 +1403,6 @@ sdk\public - - sdk\tier0 - sdk\pluginsystem @@ -1538,12 +1445,6 @@ sdk\public - - sdk\tier1 - - - sdk\tier1 - sdk\public @@ -1655,12 +1556,6 @@ sdk\launcher - - sdk\tier2 - - - sdk\tier1 - sdk\public\appframework @@ -1685,12 +1580,6 @@ thirdparty\nlohmann\detail\meta - - sdk\tier1 - - - sdk\tier1 - thirdparty\imgui\misc @@ -1703,6 +1592,135 @@ sdk\public\tier1 + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier2 + diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj index 00e7fbea..f82f7121 100644 --- a/r5dev/vproj/dedicated.vcxproj +++ b/r5dev/vproj/dedicated.vcxproj @@ -350,8 +350,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -450,49 +493,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -633,6 +639,7 @@ + diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters index 4058d7a4..6612ebde 100644 --- a/r5dev/vproj/dedicated.vcxproj.filters +++ b/r5dev/vproj/dedicated.vcxproj.filters @@ -178,6 +178,9 @@ {36aae780-3dfa-4fb4-93d8-1e453c4be236} + + {f6e7b39b-4032-4a7a-8a44-3aabcbe46ba5} + @@ -252,9 +255,6 @@ thirdparty\detours\include - - sdk\tier0 - sdk\vpc @@ -324,9 +324,6 @@ sdk\engine - - sdk\tier2 - sdk\mathlib @@ -486,12 +483,6 @@ sdk\tier0 - - sdk\tier0 - - - sdk\tier0 - sdk\rtech\stryder @@ -504,27 +495,12 @@ sdk\public - - sdk\tier1 - - - sdk\tier1 - - - sdk\tier1 - sdk\filesystem sdk\filesystem - - sdk\tier1 - - - sdk\tier1 - sdk\vstdlib @@ -543,15 +519,9 @@ sdk\vstdlib - - sdk\tier0 - sdk\launcher - - sdk\tier0 - sdk\public @@ -573,15 +543,9 @@ sdk\public - - sdk\tier0 - sdk\game\shared - - sdk\tier1 - sdk\public @@ -726,9 +690,6 @@ sdk\public - - sdk\tier1 - sdk\squirrel @@ -750,27 +711,6 @@ sdk\public - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier1 - sdk\vpc @@ -780,9 +720,6 @@ sdk\mathlib - - sdk\tier0 - sdk\public @@ -843,18 +780,9 @@ sdk\public - - sdk\tier1 - sdk\public - - sdk\tier1 - - - sdk\tier0 - sdk\public @@ -876,27 +804,12 @@ sdk\networksystem - - sdk\tier1 - - - sdk\tier1 - - - sdk\tier1 - sdk\public sdk\public - - sdk\tier0 - - - sdk\tier1 - sdk\vstdlib @@ -909,9 +822,6 @@ sdk\public - - sdk\tier0 - sdk\pluginsystem @@ -930,12 +840,6 @@ sdk\public - - sdk\tier1 - - - sdk\tier1 - sdk\public @@ -1065,12 +969,6 @@ sdk\game\server - - sdk\tier2 - - - sdk\tier1 - sdk\public\appframework @@ -1095,12 +993,6 @@ thirdparty\nlohmann\detail\meta - - sdk\tier1 - - - sdk\tier1 - sdk\public @@ -1110,6 +1002,135 @@ sdk\public\tier0 + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + @@ -1499,6 +1520,9 @@ sdk\tier1 + + sdk\tier1 + diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj index 3ec59c4e..67fcdd42 100644 --- a/r5dev/vproj/gamesdk.vcxproj +++ b/r5dev/vproj/gamesdk.vcxproj @@ -410,8 +410,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -512,50 +555,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters index c5b355f7..56a638bd 100644 --- a/r5dev/vproj/gamesdk.vcxproj.filters +++ b/r5dev/vproj/gamesdk.vcxproj.filters @@ -238,6 +238,9 @@ {676c3f77-36b9-44e8-a0d2-ff5ed6a8040e} + + {42a3745e-8686-4f83-97bd-cec9336b4937} + @@ -815,9 +818,6 @@ thirdparty\detours\include - - sdk\tier0 - sdk\vgui @@ -932,9 +932,6 @@ sdk\mathlib - - sdk\tier2 - sdk\mathlib @@ -1100,12 +1097,6 @@ sdk\materialsystem - - sdk\tier0 - - - sdk\tier0 - sdk\tier0 @@ -1124,15 +1115,6 @@ sdk\public - - sdk\tier1 - - - sdk\tier1 - - - sdk\tier1 - sdk\game\client @@ -1142,12 +1124,6 @@ sdk\filesystem - - sdk\tier1 - - - sdk\tier1 - sdk\vstdlib @@ -1166,15 +1142,9 @@ sdk\vstdlib - - sdk\tier0 - sdk\launcher - - sdk\tier0 - windows @@ -1217,18 +1187,12 @@ sdk\public - - sdk\tier0 - sdk\game\shared sdk\public - - sdk\tier1 - sdk\public @@ -1370,9 +1334,6 @@ sdk\engine - - sdk\tier1 - sdk\public @@ -1403,27 +1364,6 @@ sdk\public - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier0 - - - sdk\tier1 - - - sdk\tier0 - sdk\vpc @@ -1433,9 +1373,6 @@ sdk\mathlib - - sdk\tier0 - sdk\public @@ -1478,12 +1415,6 @@ sdk\mathlib - - sdk\tier2 - - - sdk\tier2 - sdk\mathlib @@ -1538,18 +1469,9 @@ sdk\public - - sdk\tier1 - sdk\public - - sdk\tier1 - - - sdk\tier0 - sdk\public @@ -1571,30 +1493,15 @@ sdk\networksystem - - sdk\tier1 - - - sdk\tier1 - - - sdk\tier1 - sdk\public sdk\public - - sdk\tier0 - sdk\vstdlib - - sdk\tier1 - sdk\public @@ -1607,9 +1514,6 @@ sdk\public - - sdk\tier0 - sdk\public @@ -1661,12 +1565,6 @@ sdk\public - - sdk\tier1 - - - sdk\tier1 - sdk\public @@ -1826,12 +1724,6 @@ sdk\launcher - - sdk\tier2 - - - sdk\tier1 - sdk\engine\server @@ -1859,12 +1751,6 @@ thirdparty\nlohmann\detail - - sdk\tier1 - - - sdk\tier1 - thirdparty\imgui\misc @@ -1877,6 +1763,135 @@ sdk\public\tier1 + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier1 + + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier2 + + + sdk\public\tier2 + diff --git a/r5dev/vproj/netconsole.vcxproj b/r5dev/vproj/netconsole.vcxproj index 748ef757..485ae6e8 100644 --- a/r5dev/vproj/netconsole.vcxproj +++ b/r5dev/vproj/netconsole.vcxproj @@ -70,10 +70,10 @@ + + + - - - @@ -206,7 +206,7 @@ /D "_CRT_SECURE_NO_WARNINGS" /D "NETCONSOLE" /D "SPDLOG_COMPILED_LIB" %(AdditionalOptions) Use core\stdafx.h - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Fast true @@ -240,7 +240,7 @@ Size false false - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Fast true true @@ -277,7 +277,7 @@ Neither false false - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Full false true @@ -316,7 +316,7 @@ /D "_CRT_SECURE_NO_WARNINGS" /D "NETCONSOLE" /D "SPDLOG_COMPILED_LIB" %(AdditionalOptions) Use core\stdafx.h - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Precise true @@ -350,7 +350,7 @@ Size false false - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ true Precise false @@ -391,7 +391,7 @@ Neither false false - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Full false true diff --git a/r5dev/vproj/netconsole.vcxproj.filters b/r5dev/vproj/netconsole.vcxproj.filters index acb1eeb9..5a8293ee 100644 --- a/r5dev/vproj/netconsole.vcxproj.filters +++ b/r5dev/vproj/netconsole.vcxproj.filters @@ -32,6 +32,15 @@ {2f5f6e2d-440a-472b-807d-aebfdf13dfe2} + + {60d72a7f-a540-4918-b4af-64f23fdf7306} + + + {83c26208-328a-4a67-b2f7-53bafe94bf3f} + + + {3bbe24ed-5dce-4eb6-bb00-ed575b8bffc3} + @@ -78,9 +87,6 @@ core - - sdk\tier2 - sdk\engine @@ -99,17 +105,20 @@ sdk\public - - sdk\tier0 - - - sdk\tier1 - windows core + + sdk\public\tier0 + + + sdk\public\tier1 + + + sdk\public\tier2 + \ No newline at end of file diff --git a/r5dev/vproj/pluginsdk.vcxproj b/r5dev/vproj/pluginsdk.vcxproj index 4cb513a4..e7af0510 100644 --- a/r5dev/vproj/pluginsdk.vcxproj +++ b/r5dev/vproj/pluginsdk.vcxproj @@ -91,7 +91,7 @@ Use core\stdafx.h /D "_CRT_SECURE_NO_WARNINGS" /D "PLUGINSDK" /D "SPDLOG_COMPILED_LIB" - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Precise true @@ -117,7 +117,7 @@ Use core\stdafx.h /D "_CRT_SECURE_NO_WARNINGS" /D "PLUGINSDK" /D "SPDLOG_COMPILED_LIB" /D "SPDLOG_NO_EXCEPTIONS" - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ true Precise false @@ -150,7 +150,7 @@ Use core\stdafx.h /D "_CRT_SECURE_NO_WARNINGS" /D "PLUGINSDK" /D "SPDLOG_COMPILED_LIB" - $(ProjectDir)..\;$(ProjectDir)..\thirdparty\ + $(ProjectDir)..\;$(ProjectDir)..\public\;$(ProjectDir)..\thirdparty\ Full false false