From 359820615fde8823017f38b5e27dcd4fc07b03c1 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Sat, 6 May 2023 22:59:01 +0200 Subject: [PATCH] Move low level code to tier0/tier1 Moved to tier0/tier1 so it could be compiled into a static library in the future. --- r5dev/core/init.cpp | 4 +- r5dev/core/stdafx.h | 8 +- r5dev/ebisusdk/EbisuSDK.h | 1 - r5dev/engine/sdk_dll.cpp | 2 +- r5dev/game/server/ai_networkmanager.cpp | 2 +- r5dev/game/shared/usercmd.h | 2 - r5dev/netconsole/netconsole.cpp | 2 +- r5dev/{ => public}/tier0/crashhandler.h | 0 r5dev/public/{utility => tier0}/memaddr.h | 0 r5dev/public/{utility => tier0}/module.h | 0 r5dev/public/{utility => tier0}/sigcache.h | 0 r5dev/public/{utility => tier0}/vtable.h | 0 r5dev/public/{utility => tier1}/binstream.h | 0 r5dev/public/{utility => tier1}/utility.h | 0 r5dev/sdklauncher/basepanel.cpp | 1 + r5dev/sdklauncher/sdklauncher.cpp | 2 +- r5dev/tier0/crashhandler.cpp | 2 +- r5dev/{public/utility => tier0}/memaddr.cpp | 4 +- r5dev/{public/utility => tier0}/module.cpp | 6 +- r5dev/{public/utility => tier0}/sigcache.cpp | 4 +- r5dev/{public/utility => tier0}/vtable.cpp | 2 +- r5dev/{public/utility => tier1}/binstream.cpp | 2 +- r5dev/{public/utility => tier1}/utility.cpp | 2 +- r5dev/vproj/clientsdk.vcxproj | 27 +++--- r5dev/vproj/clientsdk.vcxproj.filters | 84 +++++++++---------- r5dev/vproj/dedicated.vcxproj | 27 +++--- r5dev/vproj/dedicated.vcxproj.filters | 84 +++++++++---------- r5dev/vproj/gamesdk.vcxproj | 26 +++--- r5dev/vproj/gamesdk.vcxproj.filters | 81 +++++++++--------- r5dev/vproj/netconsole.vcxproj | 4 +- r5dev/vproj/netconsole.vcxproj.filters | 12 +-- r5dev/vproj/pluginsdk.vcxproj | 12 +-- r5dev/vproj/pluginsdk.vcxproj.filters | 37 ++++---- r5dev/vproj/sdklauncher.vcxproj | 8 +- r5dev/vproj/sdklauncher.vcxproj.filters | 22 +++-- 35 files changed, 232 insertions(+), 238 deletions(-) rename r5dev/{ => public}/tier0/crashhandler.h (100%) rename r5dev/public/{utility => tier0}/memaddr.h (100%) rename r5dev/public/{utility => tier0}/module.h (100%) rename r5dev/public/{utility => tier0}/sigcache.h (100%) rename r5dev/public/{utility => tier0}/vtable.h (100%) rename r5dev/public/{utility => tier1}/binstream.h (100%) rename r5dev/public/{utility => tier1}/utility.h (100%) rename r5dev/{public/utility => tier0}/memaddr.cpp (99%) rename r5dev/{public/utility => tier0}/module.cpp (99%) rename r5dev/{public/utility => tier0}/sigcache.cpp (99%) rename r5dev/{public/utility => tier0}/vtable.cpp (99%) rename r5dev/{public/utility => tier1}/binstream.cpp (99%) rename r5dev/{public/utility => tier1}/utility.cpp (99%) diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp index f40e062a..31487ab1 100644 --- a/r5dev/core/init.cpp +++ b/r5dev/core/init.cpp @@ -15,8 +15,10 @@ #include "tier0/cpu.h" #include "tier0/commandline.h" #include "tier0/platform_internal.h" +#include "tier0/sigcache.h" #include "tier1/cmd.h" #include "tier1/cvar.h" +#include "tier1/binstream.h" #include "vpc/IAppSystem.h" #include "vpc/keyvalues.h" #include "vpc/rson.h" @@ -124,8 +126,6 @@ #include "game/client/movehelper_client.h" #endif // !DEDICATED #include "public/edict.h" -#include "public/utility/binstream.h" -#include "public/utility/sigcache.h" #ifndef DEDICATED #include "public/idebugoverlay.h" #include "inputsystem/inputsystem.h" diff --git a/r5dev/core/stdafx.h b/r5dev/core/stdafx.h index 6a224c94..510cb14f 100644 --- a/r5dev/core/stdafx.h +++ b/r5dev/core/stdafx.h @@ -104,17 +104,15 @@ #include "common/x86defs.h" #include "common/sdkdefs.h" -#include "public/utility/utility.h" -#include "public/utility/memaddr.h" -#include "public/utility/module.h" -#include "public/utility/vdf_parser.h" - #include "core/assert.h" #include "core/termutil.h" +#include "tier0/memaddr.h" +#include "tier0/module.h" #include "tier0/basetypes.h" #include "tier0/platform.h" #include "tier0/annotations.h" #include "tier0/commonmacros.h" +#include "tier1/utility.h" #if !defined(SDKLAUNCHER) && !defined(PLUGINSDK) #include "tier0/dbg.h" #endif // !SDKLAUNCHER && !NETCONSOLE && !PLUGINSDK diff --git a/r5dev/ebisusdk/EbisuSDK.h b/r5dev/ebisusdk/EbisuSDK.h index 0e8595b5..a5d42588 100644 --- a/r5dev/ebisusdk/EbisuSDK.h +++ b/r5dev/ebisusdk/EbisuSDK.h @@ -1,6 +1,5 @@ #pragma once #include "vstdlib/completion.h" -#include "public/utility/utility.h" //#ifdef DEDICATED inline CMemory p_EbisuSDK_Tier0_Init; diff --git a/r5dev/engine/sdk_dll.cpp b/r5dev/engine/sdk_dll.cpp index c95fd95a..4255d07f 100644 --- a/r5dev/engine/sdk_dll.cpp +++ b/r5dev/engine/sdk_dll.cpp @@ -6,7 +6,7 @@ #include "core/stdafx.h" #include "tier1/cvar.h" -#include "public/utility/utility.h" +#include "tier1/utility.h" #include "engine/sdk_dll.h" #ifndef DEDICATED #include "gameui/IBrowser.h" diff --git a/r5dev/game/server/ai_networkmanager.cpp b/r5dev/game/server/ai_networkmanager.cpp index 7858261e..bd233c30 100644 --- a/r5dev/game/server/ai_networkmanager.cpp +++ b/r5dev/game/server/ai_networkmanager.cpp @@ -8,9 +8,9 @@ #include "tier0/fasttimer.h" #include "tier1/cvar.h" #include "tier1/cmd.h" +#include "tier1/utility.h" #include "mathlib/crc32.h" #include "public/edict.h" -#include "public/utility/utility.h" #include "filesystem/filesystem.h" #include "game/server/ai_node.h" #include "game/server/ai_network.h" diff --git a/r5dev/game/shared/usercmd.h b/r5dev/game/shared/usercmd.h index 654dab22..d403aa58 100644 --- a/r5dev/game/shared/usercmd.h +++ b/r5dev/game/shared/usercmd.h @@ -10,8 +10,6 @@ #ifdef _WIN32 #pragma once #endif - -#include "public/utility/memaddr.h" #include "mathlib/vector.h" //------------------------------------------------------------------------------------- diff --git a/r5dev/netconsole/netconsole.cpp b/r5dev/netconsole/netconsole.cpp index d31cd081..5dd8d02b 100644 --- a/r5dev/netconsole/netconsole.cpp +++ b/r5dev/netconsole/netconsole.cpp @@ -7,12 +7,12 @@ #include "core/stdafx.h" #include "core/termutil.h" #include "core/logdef.h" +#include "tier1/utility.h" #include "tier1/NetAdr.h" #include "tier2/socketcreator.h" #include "windows/console.h" #include "protoc/sv_rcon.pb.h" #include "protoc/cl_rcon.pb.h" -#include "public/utility/utility.h" #include "engine/net.h" #include "engine/shared/shared_rcon.h" #include "netconsole/netconsole.h" diff --git a/r5dev/tier0/crashhandler.h b/r5dev/public/tier0/crashhandler.h similarity index 100% rename from r5dev/tier0/crashhandler.h rename to r5dev/public/tier0/crashhandler.h diff --git a/r5dev/public/utility/memaddr.h b/r5dev/public/tier0/memaddr.h similarity index 100% rename from r5dev/public/utility/memaddr.h rename to r5dev/public/tier0/memaddr.h diff --git a/r5dev/public/utility/module.h b/r5dev/public/tier0/module.h similarity index 100% rename from r5dev/public/utility/module.h rename to r5dev/public/tier0/module.h diff --git a/r5dev/public/utility/sigcache.h b/r5dev/public/tier0/sigcache.h similarity index 100% rename from r5dev/public/utility/sigcache.h rename to r5dev/public/tier0/sigcache.h diff --git a/r5dev/public/utility/vtable.h b/r5dev/public/tier0/vtable.h similarity index 100% rename from r5dev/public/utility/vtable.h rename to r5dev/public/tier0/vtable.h diff --git a/r5dev/public/utility/binstream.h b/r5dev/public/tier1/binstream.h similarity index 100% rename from r5dev/public/utility/binstream.h rename to r5dev/public/tier1/binstream.h diff --git a/r5dev/public/utility/utility.h b/r5dev/public/tier1/utility.h similarity index 100% rename from r5dev/public/utility/utility.h rename to r5dev/public/tier1/utility.h diff --git a/r5dev/sdklauncher/basepanel.cpp b/r5dev/sdklauncher/basepanel.cpp index 189b438f..7a5cf996 100644 --- a/r5dev/sdklauncher/basepanel.cpp +++ b/r5dev/sdklauncher/basepanel.cpp @@ -6,6 +6,7 @@ #include "core/stdafx.h" #include "sdklauncher.h" #include "basepanel.h" +#include "utility/vdf_parser.h" //----------------------------------------------------------------------------- // Purpose: creates the surface layout diff --git a/r5dev/sdklauncher/sdklauncher.cpp b/r5dev/sdklauncher/sdklauncher.cpp index 7e3c2e70..0c97fd82 100644 --- a/r5dev/sdklauncher/sdklauncher.cpp +++ b/r5dev/sdklauncher/sdklauncher.cpp @@ -4,10 +4,10 @@ // //=============================================================================// #include "core/stdafx.h" +#include "tier1/binstream.h" #include "basepanel.h" #include "sdklauncher_const.h" #include "sdklauncher.h" -#include "public/utility/binstream.h" /////////////////////////////////////////////////////////////////////////////// // Purpose: initializes and runs the user interface diff --git a/r5dev/tier0/crashhandler.cpp b/r5dev/tier0/crashhandler.cpp index 870655f2..30f9d28e 100644 --- a/r5dev/tier0/crashhandler.cpp +++ b/r5dev/tier0/crashhandler.cpp @@ -7,7 +7,7 @@ #include "core/logdef.h" #include "tier0/cpu.h" #include "tier0/crashhandler.h" -#include "public/utility/binstream.h" +#include "tier1/binstream.h" //----------------------------------------------------------------------------- // Purpose: diff --git a/r5dev/public/utility/memaddr.cpp b/r5dev/tier0/memaddr.cpp similarity index 99% rename from r5dev/public/utility/memaddr.cpp rename to r5dev/tier0/memaddr.cpp index 7038ed58..3670d6cb 100644 --- a/r5dev/public/utility/memaddr.cpp +++ b/r5dev/tier0/memaddr.cpp @@ -4,8 +4,8 @@ // //===========================================================================// #include "core/stdafx.h" -#include "public/utility/utility.h" -#include "public/utility/memaddr.h" +#include "tier0/memaddr.h" +#include "tier1/utility.h" //----------------------------------------------------------------------------- // Purpose: check array of opcodes starting from current address diff --git a/r5dev/public/utility/module.cpp b/r5dev/tier0/module.cpp similarity index 99% rename from r5dev/public/utility/module.cpp rename to r5dev/tier0/module.cpp index 43ed6557..5cbffc12 100644 --- a/r5dev/public/utility/module.cpp +++ b/r5dev/tier0/module.cpp @@ -4,9 +4,9 @@ // //===========================================================================// #include "core/stdafx.h" -#include "public/utility/utility.h" -#include "public/utility/memaddr.h" -#include "public/utility/sigcache.h" +#include "tier0/memaddr.h" +#include "tier0/sigcache.h" +#include "tier1/utility.h" //----------------------------------------------------------------------------- // Purpose: constructor diff --git a/r5dev/public/utility/sigcache.cpp b/r5dev/tier0/sigcache.cpp similarity index 99% rename from r5dev/public/utility/sigcache.cpp rename to r5dev/tier0/sigcache.cpp index a4c97aec..97108f8a 100644 --- a/r5dev/public/utility/sigcache.cpp +++ b/r5dev/tier0/sigcache.cpp @@ -17,8 +17,8 @@ // /////////////////////////////////////////////////////////////////////////////// #include "core/stdafx.h" -#include "public/utility/binstream.h" -#include "public/utility/sigcache.h" +#include "tier0/sigcache.h" +#include "tier1/binstream.h" //----------------------------------------------------------------------------- // Purpose: whether or not to disable the caching of signatures diff --git a/r5dev/public/utility/vtable.cpp b/r5dev/tier0/vtable.cpp similarity index 99% rename from r5dev/public/utility/vtable.cpp rename to r5dev/tier0/vtable.cpp index 278b7e78..fc5f352e 100644 --- a/r5dev/public/utility/vtable.cpp +++ b/r5dev/tier0/vtable.cpp @@ -6,7 +6,7 @@ // //===========================================================================// #include "core/stdafx.h" -#include "public/utility/vtable.h" +#include "tier0/vtable.h" //----------------------------------------------------------------------------- // Purpose: create class instance from passed module and virtual table name diff --git a/r5dev/public/utility/binstream.cpp b/r5dev/tier1/binstream.cpp similarity index 99% rename from r5dev/public/utility/binstream.cpp rename to r5dev/tier1/binstream.cpp index b7958c3a..8a15ad75 100644 --- a/r5dev/public/utility/binstream.cpp +++ b/r5dev/tier1/binstream.cpp @@ -1,5 +1,5 @@ #include "core/stdafx.h" -#include "public/utility/binstream.h" +#include "tier1/binstream.h" //----------------------------------------------------------------------------- // Purpose: CIOStream constructors diff --git a/r5dev/public/utility/utility.cpp b/r5dev/tier1/utility.cpp similarity index 99% rename from r5dev/public/utility/utility.cpp rename to r5dev/tier1/utility.cpp index 645ac1b3..f4315da6 100644 --- a/r5dev/public/utility/utility.cpp +++ b/r5dev/tier1/utility.cpp @@ -4,7 +4,7 @@ #include "core/stdafx.h" #include "core/logdef.h" -#include "public/utility/utility.h" +#include "tier1/utility.h" /////////////////////////////////////////////////////////////////////////////// // For checking if a specific file exists. diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj index 236647df..38e86f97 100644 --- a/r5dev/vproj/clientsdk.vcxproj +++ b/r5dev/vproj/clientsdk.vcxproj @@ -122,12 +122,6 @@ - - - - - - @@ -141,8 +135,13 @@ + + + + + @@ -153,6 +152,7 @@ + @@ -371,21 +371,27 @@ + + + + + + @@ -399,6 +405,7 @@ + @@ -416,13 +423,6 @@ - - - - - - - @@ -510,7 +510,6 @@ - diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters index af6aa0f7..5a63552b 100644 --- a/r5dev/vproj/clientsdk.vcxproj.filters +++ b/r5dev/vproj/clientsdk.vcxproj.filters @@ -184,9 +184,6 @@ {84fdfada-64fe-4591-b639-431058a16686} - - {91e5c68f-327d-446c-840d-5e7a53d9a631} - {b22e88ea-1ee0-4431-82a4-e877a6798f23} @@ -561,18 +558,6 @@ sdk\tier1 - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - sdk\tier1 @@ -624,15 +609,9 @@ thirdparty\protobuf - - sdk\public\utility - sdk\engine - - sdk\public\utility - sdk\game\shared @@ -717,6 +696,24 @@ sdk\tier2 + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier1 + + + sdk\tier1 + @@ -1376,21 +1373,6 @@ sdk\public\bitmap - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - sdk\public @@ -1481,18 +1463,12 @@ thirdparty\protobuf - - sdk\public\utility - sdk\public sdk\engine - - sdk\public\utility - sdk\public @@ -1574,9 +1550,6 @@ sdk\public\appframework - - sdk\tier0 - sdk\vstdlib @@ -1781,6 +1754,27 @@ sdk\public\tier2 + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier1 + + + sdk\public\tier1 + diff --git a/r5dev/vproj/dedicated.vcxproj b/r5dev/vproj/dedicated.vcxproj index 75389b0a..4ac84e40 100644 --- a/r5dev/vproj/dedicated.vcxproj +++ b/r5dev/vproj/dedicated.vcxproj @@ -368,21 +368,27 @@ + + + + + + @@ -396,6 +402,7 @@ + @@ -413,13 +420,6 @@ - - - - - - - @@ -506,7 +506,6 @@ - @@ -630,12 +629,6 @@ - - - - - - @@ -649,8 +642,13 @@ + + + + + @@ -661,6 +659,7 @@ + diff --git a/r5dev/vproj/dedicated.vcxproj.filters b/r5dev/vproj/dedicated.vcxproj.filters index 0a9d9774..1185f0ba 100644 --- a/r5dev/vproj/dedicated.vcxproj.filters +++ b/r5dev/vproj/dedicated.vcxproj.filters @@ -154,9 +154,6 @@ {d49ec580-58c2-49e7-8e83-957da576febd} - - {e0155821-8fb2-4fb6-aa6a-d3e6d980b64c} - {d0650f0e-6359-4322-82c2-97f2e40f141f} @@ -777,21 +774,6 @@ sdk\public - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - sdk\networksystem @@ -846,12 +828,6 @@ thirdparty\protobuf - - sdk\public\utility - - - sdk\public\utility - sdk\public @@ -966,9 +942,6 @@ sdk\public\appframework - - sdk\tier0 - sdk\vstdlib @@ -1170,6 +1143,27 @@ sdk\public\tier2 + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier1 + + + sdk\public\tier1 + @@ -1433,18 +1427,6 @@ sdk\tier1 - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - sdk\networksystem @@ -1478,12 +1460,6 @@ thirdparty\protobuf - - sdk\public\utility - - - sdk\public\utility - sdk\game\shared @@ -1583,6 +1559,24 @@ sdk\tier2 + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier1 + + + sdk\tier1 + diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj index b554deab..01f2e9fc 100644 --- a/r5dev/vproj/gamesdk.vcxproj +++ b/r5dev/vproj/gamesdk.vcxproj @@ -139,12 +139,6 @@ - - - - - - @@ -160,8 +154,13 @@ + + + + + @@ -172,6 +171,7 @@ + @@ -425,21 +425,27 @@ + + + + + + @@ -453,6 +459,7 @@ + @@ -470,12 +477,6 @@ - - - - - - @@ -566,7 +567,6 @@ - diff --git a/r5dev/vproj/gamesdk.vcxproj.filters b/r5dev/vproj/gamesdk.vcxproj.filters index 5852af16..936c1377 100644 --- a/r5dev/vproj/gamesdk.vcxproj.filters +++ b/r5dev/vproj/gamesdk.vcxproj.filters @@ -193,9 +193,6 @@ {a7d7c0e6-d908-4e3e-ae8d-f45dea8de772} - - {2828835b-d972-4793-83f7-8eb1741b78ba} - {cd7b0538-e28c-4181-9e19-588f77d41d36} @@ -603,18 +600,6 @@ sdk\tier1 - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - sdk\networksystem @@ -669,15 +654,9 @@ thirdparty\protobuf - - sdk\public\utility - sdk\engine - - sdk\public\utility - sdk\game\server @@ -786,6 +765,24 @@ sdk\tier2 + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier1 + + + sdk\tier1 + @@ -1493,18 +1490,6 @@ sdk\public\bitmap - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - - - sdk\public\utility - sdk\networksystem @@ -1610,18 +1595,12 @@ thirdparty\protobuf - - sdk\public\utility - sdk\public sdk\engine - - sdk\public\utility - sdk\public @@ -1748,9 +1727,6 @@ sdk\public\appframework - - sdk\tier0 - sdk\vstdlib @@ -1958,6 +1934,27 @@ sdk\public\tier2 + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier0 + + + sdk\public\tier1 + + + sdk\public\tier1 + diff --git a/r5dev/vproj/netconsole.vcxproj b/r5dev/vproj/netconsole.vcxproj index ef2f2027..a0584492 100644 --- a/r5dev/vproj/netconsole.vcxproj +++ b/r5dev/vproj/netconsole.vcxproj @@ -58,9 +58,9 @@ NotUsing NotUsing - + @@ -76,8 +76,8 @@ + - diff --git a/r5dev/vproj/netconsole.vcxproj.filters b/r5dev/vproj/netconsole.vcxproj.filters index 7f0f9dc0..258f35a6 100644 --- a/r5dev/vproj/netconsole.vcxproj.filters +++ b/r5dev/vproj/netconsole.vcxproj.filters @@ -67,9 +67,6 @@ thirdparty\protobuf - - sdk\public - sdk\tier1 @@ -91,6 +88,9 @@ sdk\engine\shared + + sdk\tier1 + @@ -111,9 +111,6 @@ thirdparty\protobuf - - sdk\public - windows @@ -135,5 +132,8 @@ sdk\engine\shared + + sdk\public\tier1 + \ No newline at end of file diff --git a/r5dev/vproj/pluginsdk.vcxproj b/r5dev/vproj/pluginsdk.vcxproj index b5cf62a4..1c1c6ae2 100644 --- a/r5dev/vproj/pluginsdk.vcxproj +++ b/r5dev/vproj/pluginsdk.vcxproj @@ -193,17 +193,17 @@ - - - + + + - - - + + + diff --git a/r5dev/vproj/pluginsdk.vcxproj.filters b/r5dev/vproj/pluginsdk.vcxproj.filters index 99505c19..66e6cddc 100644 --- a/r5dev/vproj/pluginsdk.vcxproj.filters +++ b/r5dev/vproj/pluginsdk.vcxproj.filters @@ -10,8 +10,17 @@ {49a28380-a137-410c-ad75-a0b80176443e} - - {f0d21a39-484c-4464-a3fe-a629adc1930e} + + {797026e6-4caf-4488-970f-1a956f930a34} + + + {7f44ca93-e652-442b-a16a-cf6f1bd2eb08} + + + {5df719b2-f053-4493-bf77-1e818d98aa99} + + + {ca1aea81-de23-4883-b828-6319d12831fc} @@ -24,14 +33,14 @@ sdk - - public\utility + + tier0 - - public\utility + + tier0 - - core + + tier1 @@ -44,14 +53,14 @@ sdk - - public\utility + + public\tier1 - - public\utility + + public\tier0 - - core + + public\tier0 \ No newline at end of file diff --git a/r5dev/vproj/sdklauncher.vcxproj b/r5dev/vproj/sdklauncher.vcxproj index 0d834a85..afd29bc3 100644 --- a/r5dev/vproj/sdklauncher.vcxproj +++ b/r5dev/vproj/sdklauncher.vcxproj @@ -212,10 +212,10 @@ Create Create - - + + @@ -227,8 +227,8 @@ - - + + diff --git a/r5dev/vproj/sdklauncher.vcxproj.filters b/r5dev/vproj/sdklauncher.vcxproj.filters index 3bbb13b2..4ed1ad56 100644 --- a/r5dev/vproj/sdklauncher.vcxproj.filters +++ b/r5dev/vproj/sdklauncher.vcxproj.filters @@ -26,6 +26,12 @@ {dc968871-7ca2-452b-a5b1-350a12dd54aa} + + {520316cd-14bb-47f8-9390-cc050b7115e3} + + + {8aee4c57-9624-423b-a411-1ea3992077ab} + @@ -37,11 +43,11 @@ launcher - - public + + tier1 - - public + + tier1 @@ -77,11 +83,11 @@ launcher - - public + + public\tier1 - - public + + public\tier1