Add client build only to SDK (client.dll)

For future S4 debugging
2025-02-09 19:15:03 +01:00 · 2022-03-23 23:05:43 +01:00 · 2022-03-23 23:05:43 +01:00 · bc3d42d0be
commit bc3d42d0be
parent 7d9b125d93
9 changed files with 1680 additions and 12 deletions
--- a/r5dev/ClientSDK.def
+++ b/r5dev/ClientSDK.def
@ -0,0 +1,4 @@
+LIBRARY client
+
+EXPORTS
+    DummyExport @1
--- a/r5dev/core/init.cpp
+++ b/r5dev/core/init.cpp
@ -35,8 +35,10 @@
 #endif // !DEDICATED
 #include "client/client.h"
 #include "client/IVEngineClient.h"
+#ifndef GAMECLIENTONLY
 #include "server/server.h"
 #include "server/IVEngineServer.h"
+#endif // !GAMECLIENTONLY
 #include "squirrel/sqinit.h"
 #include "squirrel/sqapi.h"
 #include "squirrel/sqvm.h"
@ -52,7 +54,9 @@
 #include "engine/net.h"
 #include "engine/net_chan.h"
 #include "engine/cl_main.h"
+#ifndef GAMECLIENTONLY
 #include "engine/sv_main.h"
+#endif // !GAMECLIENTONLY
 #include "engine/sys_dll.h"
 #include "engine/sys_dll2.h"
 #include "engine/sys_engine.h"
@ -63,6 +67,7 @@
 #ifndef DEDICATED
 #include "engine/debugoverlay.h"
 #endif // !DEDICATED
+#ifndef GAMECLIENTONLY
 #include "game/server/ai_node.h"
 #include "game/server/ai_network.h"
 #include "game/server/ai_networkmanager.h"
@ -71,6 +76,7 @@
 #include "game/server/fairfight_impl.h"
 #include "game/server/gameinterface.h"
 #include "public/include/edict.h"
+#endif // !GAMECLIENTONLY
 #ifndef DEDICATED
 #include "inputsystem/inputsystem.h"
 #include "windows/id3dx.h"
@ -123,9 +129,9 @@ void Systems_Init()
 	CHLClient_Attach();
 #endif // !DEDICATED

-#ifdef GAMEDLL_S3
+#if !defined(GAMECLIENTONLY) && defined (GAMEDLL_S3)
 	CServer_Attach(); // S1 and S2 CServer functions require work.
-#endif // GAMEDLL_S3
+#endif // !GAMECLIENTONLY && GAMEDLL_S3

 // !TEMP UNTIL CHOSTSTATE IS BUILD AGNOSTIC! //
 #if defined (DEDICATED) || defined (GAMEDLL_S3)
@ -137,7 +143,11 @@ void Systems_Init()
 	ConCommand_Attach();
 	IConVar_Attach();
 	CKeyValueSystem_Attach();
+
+#ifndef GAMECLIENTONLY
 	IVEngineServer_Attach();
+#endif // !GAMECLIENTONLY
+
 	SQAPI_Attach();
 	SQVM_Attach();

@ -150,9 +160,11 @@ void Systems_Init()
 	HCVideoMode_Common_Attach();
 	//DebugOverlays_Attach();
 #endif // !DEDICATED
+
+#ifndef GAMECLIENTONLY
 	CAI_Utility_Attach();
 	CAI_NetworkManager_Attach();
-
+#endif // !#ifndef GAMECLIENTONLY
 	// Patch instructions
 	RuntimePtc_Init();

@ -215,9 +227,9 @@ void Systems_Shutdown()
 	CHLClient_Detach();
 #endif // !DEDICATED

-#ifdef GAMEDLL_S3
+#if !defined(GAMECLIENTONLY) && defined (GAMEDLL_S3)
 	CServer_Detach(); // S1 and S2 CServer functions require work.
-#endif // GAMEDLL_S3
+#endif // !GAMECLIENTONLY && GAMEDLL_S3

 // !TEMP UNTIL CHOSTSTATE IS BUILD AGNOSTIC! //
 #if defined (DEDICATED) || defined (GAMEDLL_S3)
@ -229,7 +241,10 @@ void Systems_Shutdown()
 	ConCommand_Detach();
 	IConVar_Detach();
 	CKeyValueSystem_Detach();
+
+#ifndef GAMECLIENTONLY
 	IVEngineServer_Detach();
+#endif // !GAMECLIENTONLY
 	SQAPI_Detach();
 	SQVM_Detach();

@ -242,8 +257,11 @@ void Systems_Shutdown()
 	HCVideoMode_Common_Detach();
 	//DebugOverlays_Detach();
 #endif // !DEDICATED
+
+#ifndef GAMECLIENTONLY
 	CAI_Utility_Detach();
 	CAI_NetworkManager_Detach();
+#endif // !GAMECLIENTONLY

 	// Commit the transaction
 	DetourTransactionCommit();
--- a/r5dev/engine/host_state.cpp
+++ b/r5dev/engine/host_state.cpp
@ -28,7 +28,9 @@
 #include "client/IVEngineClient.h"
 #include "networksystem/pylon.h"
 #include "public/include/bansystem.h"
+#ifndef GAMECLIENTONLY
 #include "game/server/gameinterface.h"
+#endif // !GAMECLIENTONLY

 std::chrono::time_point<std::chrono::steady_clock> tpPylonStartClock   = std::chrono::steady_clock::now();
 std::chrono::time_point<std::chrono::steady_clock> tpBanListStartClock = std::chrono::steady_clock::now();
@ -60,7 +62,9 @@ FORCEINLINE void CHostState::FrameUpdate(void* rcx, void* rdx, float time)
 	}
 	else
 	{
+#ifndef GAMECLIENTONLY
 		*g_ServerAbortServer = true;
+#endif // !GAMECLIENTONLY
 		do
 		{
 			Cbuf_Execute();
@ -211,7 +215,9 @@ FORCEINLINE void CHostState::GameShutDown(void)
 	g_bLevelResourceInitialized = false;
 	if (m_bActiveGame)
 	{
+#ifndef GAMECLIENTONLY
 		g_pServerGameDLL->GameShutdown();
+#endif // !GAMECLIENTONLY
 		m_bActiveGame = 0;
 	}
 }
@ -302,7 +308,9 @@ FORCEINLINE void CHostState::State_ChangeLevelMP(void)
 	m_flShortFrameTime = 0.5; // Set frame time.
 	g_bLevelResourceInitialized = false;

+#ifndef GAMECLIENTONLY
 	g_pServerGameDLL->LevelShutdown();
+#endif // !GAMECLIENTONLY
 	if (CModelLoader_Map_IsValidFn(g_CModelLoader, m_levelName)) // Check if map is valid and if we can start a new game.
 	{
 #ifndef DEDICATED
--- a/r5dev/engine/net_chan.cpp
+++ b/r5dev/engine/net_chan.cpp
@ -11,13 +11,12 @@
 #include "mathlib/color.h"
 #include "engine/sys_utils.h"
 #include "engine/net_chan.h"
+#ifndef GAMECLIENTONLY
 #include "engine/baseclient.h"
+#endif // !GAMECLIENTONLY
 #ifdef DEDICATED
 #include "engine/sv_rcon.h"
-#endif // DEDICATED
-#include "server/IVEngineServer.h"
-
-#ifndef DEDICATED
+#else // DEDICATED
 #include "gameui/IConsole.h"
 #endif // !DEDICATED

@ -135,6 +134,7 @@ void HNET_PrintFunc(const char* fmt, ...)
 //-----------------------------------------------------------------------------
 void NET_DisconnectClient(CClient* pClient, int nIndex, const char* szReason, uint8_t unk1, char unk2)
 {
+#ifndef GAMECLIENTONLY
 	if (!pClient) // Client valid?
 	{
 		return;
@ -154,6 +154,7 @@ void NET_DisconnectClient(CClient* pClient, int nIndex, const char* szReason, ui
 	pClient->GetNetChan() = nullptr;                           // Null netchan.
 	CBaseClient_Clear((std::int64_t)pClient);                  // Reset CClient instance for client.
 	g_bIsPersistenceVarSet[nIndex] = false;                    // Reset Persistence var.
+#endif // !GAMECLIENTONLY
 }

 ///////////////////////////////////////////////////////////////////////////////
--- a/r5dev/gameui/IBrowser.cpp
+++ b/r5dev/gameui/IBrowser.cpp
@ -60,6 +60,7 @@ IBrowser::IBrowser(void)
        m_vszMapFileNameList.push_back(filename);
    }

+#ifndef GAMECLIENTONLY
    static std::thread hostingServerRequestThread([this]()
    {
        while (true)
@ -70,6 +71,7 @@ IBrowser::IBrowser(void)
    });

    hostingServerRequestThread.detach();
+#endif // !GAMECLIENTONLY

    /* Obtain handle to module */
    static HGLOBAL rcData = NULL;
@ -157,10 +159,12 @@ void IBrowser::CompMenu(void)
    {
        SetSection(eSection::SERVER_BROWSER);
    }
+#ifndef GAMECLIENTONLY
    if (ImGui::TabItemButton("Host Server"))
    {
        SetSection(eSection::HOST_SERVER);
    }
+#endif // !GAMECLIENTONLY
    if (ImGui::TabItemButton("Settings"))
    {
        SetSection(eSection::SETTINGS);
@ -331,6 +335,7 @@ void IBrowser::ConnectToServer(const std::string& svServer, const std::string& s
 //-----------------------------------------------------------------------------
 void IBrowser::LaunchServer(void)
 {
+#ifndef GAMECLIENTONLY
    DevMsg(eDLL_T::ENGINE, "Starting Server with name '%s', map '%s' and playlist '%s'\n", m_Server.svServerName.c_str(), m_Server.svMapName.c_str(), m_Server.svPlaylist.c_str());

    /*
@ -348,6 +353,7 @@ void IBrowser::LaunchServer(void)
    std::stringstream cmd;
    cmd << "map " << m_Server.svMapName;
    ProcessCommand(cmd.str().c_str());
+#endif // !GAMECLIENTONLY
 }

 //-----------------------------------------------------------------------------
@ -420,6 +426,7 @@ void IBrowser::HiddenServersModal(void)
 //-----------------------------------------------------------------------------
 void IBrowser::HostServerSection(void)
 {
+#ifndef GAMECLIENTONLY
    static std::string svServerNameErr = "";

    ImGui::InputTextWithHint("##ServerHost_ServerName", "Server Name (Required)", &m_Server.svServerName);
@ -570,6 +577,7 @@ void IBrowser::HostServerSection(void)
            CKeyValueSystem_InitPlaylist(); // Re-Init playlist.
        }
    }
+#endif // !GAMECLIENTONLY
 }

 //-----------------------------------------------------------------------------
@ -577,6 +585,7 @@ void IBrowser::HostServerSection(void)
 //-----------------------------------------------------------------------------
 void IBrowser::UpdateHostingStatus(void)
 {
+#ifndef GAMECLIENTONLY
    if (!g_pHostState || !g_pCVar)
    {
        return;
@ -622,6 +631,7 @@ void IBrowser::UpdateHostingStatus(void)
    default:
        break;
    }
+#endif // !GAMECLIENTONLY
 }

 //-----------------------------------------------------------------------------
@ -629,6 +639,7 @@ void IBrowser::UpdateHostingStatus(void)
 //-----------------------------------------------------------------------------
 void IBrowser::SendHostingPostRequest(void)
 {
+#ifndef GAMECLIENTONLY
    m_szHostToken = std::string();
    DevMsg(eDLL_T::CLIENT, "Sending PostServerHost request\n");
    bool result = g_pR5net->PostServerHost(m_szHostRequestMessage, m_szHostToken,
@ -663,6 +674,7 @@ void IBrowser::SendHostingPostRequest(void)
    {
        m_iv4HostRequestMessageColor = ImVec4(1.00f, 0.00f, 0.00f, 1.00f);
    }
+#endif // !GAMECLIENTONLY
 }

 //-----------------------------------------------------------------------------
--- a/r5dev/vproj/clientsdk.vcxproj
+++ b/r5dev/vproj/clientsdk.vcxproj
@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\bsplib\bsplib.cpp" />
+    <ClCompile Include="..\client\cdll_engine_int.cpp" />
+    <ClCompile Include="..\client\client.cpp" />
+    <ClCompile Include="..\client\IVEngineClient.cpp" />
+    <ClCompile Include="..\common\opcodes.cpp" />
+    <ClCompile Include="..\core\dllmain.cpp" />
+    <ClCompile Include="..\core\init.cpp" />
+    <ClCompile Include="..\core\logdef.cpp" />
+    <ClCompile Include="..\core\stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\core\termutil.cpp" />
+    <ClCompile Include="..\ebisusdk\EbisuSDK.cpp" />
+    <ClCompile Include="..\engine\baseclient.cpp" />
+    <ClCompile Include="..\engine\baseclientstate.cpp" />
+    <ClCompile Include="..\engine\cl_rcon.cpp" />
+    <ClCompile Include="..\engine\cmodel_bsp.cpp" />
+    <ClCompile Include="..\engine\common.cpp" />
+    <ClCompile Include="..\engine\gl_screen.cpp" />
+    <ClCompile Include="..\engine\host_cmd.cpp" />
+    <ClCompile Include="..\engine\host_state.cpp" />
+    <ClCompile Include="..\engine\modelloader.cpp" />
+    <ClCompile Include="..\engine\net.cpp" />
+    <ClCompile Include="..\engine\net_chan.cpp" />
+    <ClCompile Include="..\engine\sys_dll.cpp" />
+    <ClCompile Include="..\engine\sys_dll2.cpp" />
+    <ClCompile Include="..\engine\sys_engine.cpp" />
+    <ClCompile Include="..\engine\sys_getmodes.cpp" />
+    <ClCompile Include="..\engine\sys_utils.cpp" />
+    <ClCompile Include="..\gameui\IConsole.cpp" />
+    <ClCompile Include="..\gameui\IBrowser.cpp" />
+    <ClCompile Include="..\inputsystem\inputsystem.cpp" />
+    <ClCompile Include="..\launcher\IApplication.cpp" />
+    <ClCompile Include="..\materialsystem\cmaterialglue.cpp" />
+    <ClCompile Include="..\materialsystem\materialsystem.cpp" />
+    <ClCompile Include="..\mathlib\adler32.cpp" />
+    <ClCompile Include="..\mathlib\bits.cpp" />
+    <ClCompile Include="..\mathlib\crc32.cpp" />
+    <ClCompile Include="..\mathlib\IceKey.cpp" />
+    <ClCompile Include="..\mathlib\sha256.cpp" />
+    <ClCompile Include="..\networksystem\pylon.cpp" />
+    <ClCompile Include="..\networksystem\r5net.cpp" />
+    <ClCompile Include="..\protoc\cl_rcon.pb.cc">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\protoc\sv_rcon.pb.cc">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\public\bansystem.cpp" />
+    <ClCompile Include="..\public\binstream.cpp" />
+    <ClCompile Include="..\public\utility.cpp" />
+    <ClCompile Include="..\rtech\rtech_utils.cpp" />
+    <ClCompile Include="..\rtech\rtech_game.cpp" />
+    <ClCompile Include="..\rtech\stryder.cpp" />
+    <ClCompile Include="..\squirrel\sqapi.cpp" />
+    <ClCompile Include="..\squirrel\sqinit.cpp" />
+    <ClCompile Include="..\squirrel\sqvm.cpp" />
+    <ClCompile Include="..\thirdparty\imgui\src\imgui_utility.cpp" />
+    <ClCompile Include="..\tier0\commandline.cpp" />
+    <ClCompile Include="..\tier0\cmd.cpp" />
+    <ClCompile Include="..\tier0\completion.cpp" />
+    <ClCompile Include="..\tier0\cpu.cpp" />
+    <ClCompile Include="..\tier0\cputopology.cpp" />
+    <ClCompile Include="..\tier0\cvar.cpp" />
+    <ClCompile Include="..\tier0\fasttimer.cpp" />
+    <ClCompile Include="..\tier0\IConVar.cpp" />
+    <ClCompile Include="..\tier1\NetAdr2.cpp" />
+    <ClCompile Include="..\tier2\socketcreator.cpp" />
+    <ClCompile Include="..\vguimatsurface\MatSystemSurface.cpp" />
+    <ClCompile Include="..\vgui\vgui_baseui_interface.cpp" />
+    <ClCompile Include="..\vgui\vgui_debugpanel.cpp" />
+    <ClCompile Include="..\vgui\vgui_fpspanel.cpp" />
+    <ClCompile Include="..\vpc\basefilesystem.cpp" />
+    <ClCompile Include="..\vpc\IAppSystem.cpp" />
+    <ClCompile Include="..\vpc\interfaces.cpp" />
+    <ClCompile Include="..\vpc\keyvalues.cpp" />
+    <ClCompile Include="..\vphysics\QHull.cpp" />
+    <ClCompile Include="..\vpklib\packedstore.cpp" />
+    <ClCompile Include="..\windows\console.cpp" />
+    <ClCompile Include="..\windows\id3dx.cpp" />
+    <ClCompile Include="..\windows\input.cpp" />
+    <ClCompile Include="..\windows\system.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\appframework\engine_launcher_api.h" />
+    <ClInclude Include="..\appframework\iappsystem.h" />
+    <ClInclude Include="..\bsplib\bsplib.h" />
+    <ClInclude Include="..\client\cdll_engine_int.h" />
+    <ClInclude Include="..\client\client.h" />
+    <ClInclude Include="..\client\IVEngineClient.h" />
+    <ClInclude Include="..\common\igameserverdata.h" />
+    <ClInclude Include="..\common\netmessages.h" />
+    <ClInclude Include="..\common\opcodes.h" />
+    <ClInclude Include="..\common\protocol.h" />
+    <ClInclude Include="..\common\pseudodefs.h" />
+    <ClInclude Include="..\core\assert.h" />
+    <ClInclude Include="..\core\init.h" />
+    <ClInclude Include="..\core\logdef.h" />
+    <ClInclude Include="..\core\r5dev.h" />
+    <ClInclude Include="..\core\stdafx.h" />
+    <ClInclude Include="..\core\termutil.h" />
+    <ClInclude Include="..\ebisusdk\EbisuSDK.h" />
+    <ClInclude Include="..\engine\baseclient.h" />
+    <ClInclude Include="..\engine\baseclientstate.h" />
+    <ClInclude Include="..\engine\cl_main.h" />
+    <ClInclude Include="..\engine\cl_rcon.h" />
+    <ClInclude Include="..\engine\cmodel_bsp.h" />
+    <ClInclude Include="..\engine\common.h" />
+    <ClInclude Include="..\engine\debugoverlay.h" />
+    <ClInclude Include="..\engine\gl_matsysiface.h" />
+    <ClInclude Include="..\engine\gl_screen.h" />
+    <ClInclude Include="..\engine\host_cmd.h" />
+    <ClInclude Include="..\engine\host_state.h" />
+    <ClInclude Include="..\engine\modelloader.h" />
+    <ClInclude Include="..\engine\net.h" />
+    <ClInclude Include="..\engine\net_chan.h" />
+    <ClInclude Include="..\engine\sys_dll.h" />
+    <ClInclude Include="..\engine\sys_dll2.h" />
+    <ClInclude Include="..\engine\sys_engine.h" />
+    <ClInclude Include="..\engine\sys_getmodes.h" />
+    <ClInclude Include="..\engine\sys_utils.h" />
+    <ClInclude Include="..\gameui\IConsole.h" />
+    <ClInclude Include="..\gameui\IBrowser.h" />
+    <ClInclude Include="..\inputsystem\ButtonCode.h" />
+    <ClInclude Include="..\inputsystem\inputsystem.h" />
+    <ClInclude Include="..\launcher\IApplication.h" />
+    <ClInclude Include="..\materialsystem\cmaterialglue.h" />
+    <ClInclude Include="..\materialsystem\materialsystem.h" />
+    <ClInclude Include="..\mathlib\adler32.h" />
+    <ClInclude Include="..\mathlib\bits.h" />
+    <ClInclude Include="..\mathlib\color.h" />
+    <ClInclude Include="..\mathlib\crc32.h" />
+    <ClInclude Include="..\mathlib\IceKey.H" />
+    <ClInclude Include="..\mathlib\parallel_for.h" />
+    <ClInclude Include="..\mathlib\sha256.h" />
+    <ClInclude Include="..\mathlib\swap.h" />
+    <ClInclude Include="..\mathlib\vector.h" />
+    <ClInclude Include="..\milessdk\win64_rrthreads.h" />
+    <ClInclude Include="..\networksystem\pylon.h" />
+    <ClInclude Include="..\networksystem\r5net.h" />
+    <ClInclude Include="..\networksystem\serverlisting.h" />
+    <ClInclude Include="..\networksystem\sm_protocol.h" />
+    <ClInclude Include="..\protoc\cl_rcon.pb.h" />
+    <ClInclude Include="..\protoc\sv_rcon.pb.h" />
+    <ClInclude Include="..\public\include\edict.h" />
+    <ClInclude Include="..\public\include\globalvars_base.h" />
+    <ClInclude Include="..\public\include\memaddr.h" />
+    <ClInclude Include="..\public\include\bansystem.h" />
+    <ClInclude Include="..\public\include\binstream.h" />
+    <ClInclude Include="..\public\include\httplib.h" />
+    <ClInclude Include="..\public\include\json.hpp" />
+    <ClInclude Include="..\public\include\stb_image.h" />
+    <ClInclude Include="..\public\include\utility.h" />
+    <ClInclude Include="..\core\resource.h" />
+    <ClInclude Include="..\rtech\rtech_utils.h" />
+    <ClInclude Include="..\rtech\rtech_game.h" />
+    <ClInclude Include="..\rtech\stryder.h" />
+    <ClInclude Include="..\squirrel\sqapi.h" />
+    <ClInclude Include="..\squirrel\sqinit.h" />
+    <ClInclude Include="..\squirrel\sqvm.h" />
+    <ClInclude Include="..\studiorender\studiorendercontext.h" />
+    <ClInclude Include="..\thirdparty\detours\include\detours.h" />
+    <ClInclude Include="..\thirdparty\detours\include\detver.h" />
+    <ClInclude Include="..\thirdparty\detours\include\idetour.h" />
+    <ClInclude Include="..\thirdparty\detours\include\syelog.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imconfig.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imgui.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imgui_impl_dx11.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imgui_impl_win32.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imgui_internal.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imgui_stdlib.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imgui_utility.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imstb_rectpack.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imstb_textedit.h" />
+    <ClInclude Include="..\thirdparty\imgui\include\imstb_truetype.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_assert.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_checksum.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_config.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_core.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_helpers.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_huffman_codes.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_lzbase.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_match_accel.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_math.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_mem.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_null_threading.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_platform.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_polar_codes.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_prefix_coding.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_pthreads_threading.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_static_lib.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_symbol_codec.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_threading.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_timer.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_traits.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_types.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_utils.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_vector.h" />
+    <ClInclude Include="..\thirdparty\lzham\include\lzham_win32_threading.h" />
+    <ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_comp.h" />
+    <ClInclude Include="..\thirdparty\lzham\lzhamcomp\lzham_lzcomp_internal.h" />
+    <ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_decomp.h" />
+    <ClInclude Include="..\thirdparty\lzham\lzhamdecomp\lzham_lzdecompbase.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\async.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\async_logger-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\async_logger.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\cfg\argv.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\cfg\env.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\cfg\helpers-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\cfg\helpers.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\common-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\common.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\backtracer-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\backtracer.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\circular_q.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\console_globals.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\file_helper-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\file_helper.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\fmt_helper.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\log_msg-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\log_msg.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\log_msg_buffer-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\log_msg_buffer.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\mpmc_blocking_q.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\null_mutex.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\os-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\os.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\periodic_worker-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\periodic_worker.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\registry-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\registry.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\synchronous_factory.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\tcp_client-windows.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\tcp_client.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\thread_pool-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\thread_pool.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\details\windows_include.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bin_to_hex.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\args.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\chrono.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\color.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\compile.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\core.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\format-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\format.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\locale.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\os.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\ostream.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\printf.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\ranges.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\bundled\xchar.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\chrono.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\fmt.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\ostr.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fmt\xchar.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\formatter.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\fwd.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\logger-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\logger.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\pattern_formatter-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\pattern_formatter.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\android_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\ansicolor_sink-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\ansicolor_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\base_sink-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\base_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\basic_file_sink-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\basic_file_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\daily_file_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\dist_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\dup_filter_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\hourly_file_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\mongo_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\msvc_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\null_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\ostream_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\qt_sinks.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\ringbuffer_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\rotating_file_sink-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\rotating_file_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\sink-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\stdout_color_sinks-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\stdout_color_sinks.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\stdout_sinks-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\stdout_sinks.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\syslog_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\systemd_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\tcp_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\wincolor_sink-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\wincolor_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\sinks\win_eventlog_sink.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\spdlog-inl.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\spdlog.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\stopwatch.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\tweakme.h" />
+    <ClInclude Include="..\thirdparty\spdlog\include\version.h" />
+    <ClInclude Include="..\tier0\basetypes.h" />
+    <ClInclude Include="..\tier0\commandline.h" />
+    <ClInclude Include="..\tier0\cmd.h" />
+    <ClInclude Include="..\tier0\completion.h" />
+    <ClInclude Include="..\tier0\cpu.h" />
+    <ClInclude Include="..\tier0\cputopology.h" />
+    <ClInclude Include="..\tier0\cvar.h" />
+    <ClInclude Include="..\tier0\fasttimer.h" />
+    <ClInclude Include="..\tier0\IConVar.h" />
+    <ClInclude Include="..\tier0\interface.h" />
+    <ClInclude Include="..\tier0\platform.h" />
+    <ClInclude Include="..\tier1\NetAdr2.h" />
+    <ClInclude Include="..\tier2\socketcreator.h" />
+    <ClInclude Include="..\vguimatsurface\MatSystemSurface.h" />
+    <ClInclude Include="..\vgui\vgui_baseui_interface.h" />
+    <ClInclude Include="..\vgui\vgui_debugpanel.h" />
+    <ClInclude Include="..\vgui\vgui.h" />
+    <ClInclude Include="..\vgui\vgui_fpspanel.h" />
+    <ClInclude Include="..\vpc\basefilesystem.h" />
+    <ClInclude Include="..\vpc\IAppSystem.h" />
+    <ClInclude Include="..\vpc\interfaces.h" />
+    <ClInclude Include="..\vpc\keyvalues.h" />
+    <ClInclude Include="..\vphysics\QHull.h" />
+    <ClInclude Include="..\vpklib\packedstore.h" />
+    <ClInclude Include="..\windows\console.h" />
+    <ClInclude Include="..\windows\id3dx.h" />
+    <ClInclude Include="..\windows\input.h" />
+    <ClInclude Include="..\windows\system.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\resource\r5dev.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\shared\resource\lockedserver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\ClientSDK.def" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}</ProjectGuid>
+    <RootNamespace>client</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>clientsdk</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>Static</UseOfMfc>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\PropertySheet.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\r5dev.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include</IncludePath>
+    <LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x64</LibraryPath>
+    <TargetName>client</TargetName>
+    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
+    <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include</IncludePath>
+    <LibraryPath>$(LibraryPath);$(DXSDK_DIR)Lib\x64</LibraryPath>
+    <TargetName>client</TargetName>
+    <ReferencePath>$(VC_ReferencesPath_x64);</ReferencePath>
+    <OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)build\$(ProjectName)\$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;R5DEV_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <AdditionalOptions>/D GAMESDK /D GAMECLIENTONLY /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>..\ClientSDK.def</ModuleDefinitionFile>
+      <AdditionalDependencies>d3d11.lib;bcrypt.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\client.dll" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;R5DEV_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>core\stdafx.h</PrecompiledHeaderFile>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <DisableSpecificWarnings>
+      </DisableSpecificWarnings>
+      <OmitFramePointers>true</OmitFramePointers>
+      <EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <StringPooling>true</StringPooling>
+      <CreateHotpatchableImage>
+      </CreateHotpatchableImage>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <AdditionalOptions>/D GAMESDK /D GAMECLIENTONLY /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableUAC>false</EnableUAC>
+      <ModuleDefinitionFile>..\ClientSDK.def</ModuleDefinitionFile>
+      <AdditionalDependencies>d3d11.lib;bcrypt.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\client.dll" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
+    </PostBuildEvent>
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
--- a/r5dev/vproj/clientsdk.vcxproj.filters
+++ b/r5dev/vproj/clientsdk.vcxproj.filters
--- a/r5dev/vproj/gamesdk.vcxproj
+++ b/r5dev/vproj/gamesdk.vcxproj
@ -445,7 +445,7 @@
      <AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
    </Link>
    <PostBuildEvent>
-      <Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
+      <Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\r5apexsdkd64.dll" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
    </PostBuildEvent>
    <PreBuildEvent>
      <Command>
@ -487,7 +487,7 @@
      <AdditionalLibraryDirectories>$(SolutionDir)lib\$(Configuration)\</AdditionalLibraryDirectories>
    </Link>
    <PostBuildEvent>
-      <Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
+      <Command>IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\r5apexsdkd64.dll" &amp;&amp; copy /Y "$(TargetPath)" "$(SolutionDir)..\..\</Command>
    </PostBuildEvent>
    <PreBuildEvent>
      <Command>
--- a/r5sdk.sln
+++ b/r5sdk.sln
@ -34,7 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblzham", "r5dev\vproj\lib
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdetours", "r5dev\vproj\libdetours.vcxproj", "{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "thirdparty", "thirdparty", "{9D2825F8-4BEC-4D0A-B125-6390B554D519}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libraries", "libraries", "{9D2825F8-4BEC-4D0A-B125-6390B554D519}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libimgui", "r5dev\vproj\libimgui.vcxproj", "{AD7B43E9-2416-4B39-829E-D9D2071479B1}"
 EndProject
@ -67,6 +67,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "naveditor", "r5dev\vproj\na
 		{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {6DC4E2AF-1740-480B-A9E4-BA766BC6B58D}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientsdk", "r5dev\vproj\clientsdk.vcxproj", "{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{3363D141-5FD1-4569-B1B0-EC59ABBA5FAC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@ -195,11 +199,21 @@ Global
 		{1942083A-03D9-4D76-B644-A3FA2A118A35}.Release|x64.Build.0 = Release|x64
 		{1942083A-03D9-4D76-B644-A3FA2A118A35}.Release|x86.ActiveCfg = Release|x64
 		{1942083A-03D9-4D76-B644-A3FA2A118A35}.Release|x86.Build.0 = Release|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Debug|x64.ActiveCfg = Debug|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Debug|x64.Build.0 = Debug|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Debug|x86.ActiveCfg = Debug|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Debug|x86.Build.0 = Debug|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Release|x64.ActiveCfg = Release|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Release|x64.Build.0 = Release|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Release|x86.ActiveCfg = Release|x64
+		{8FC77C68-CE93-45CE-B753-68ABE36BCDDB}.Release|x86.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{18F8C75E-3844-4AA6-AB93-980A08253519} = {3363D141-5FD1-4569-B1B0-EC59ABBA5FAC}
+		{9579B31F-CE24-4852-A941-CD1AD71E2248} = {3363D141-5FD1-4569-B1B0-EC59ABBA5FAC}
 		{B273A875-6618-49FE-8CA4-0B693BA264D5} = {2C6C4C79-2028-4165-8BA7-99EB6095A006}
 		{1CC6BF42-D20F-4599-8619-290AF5FB4034} = {9D2825F8-4BEC-4D0A-B125-6390B554D519}
 		{6DC4E2AF-1740-480B-A9E4-BA766BC6B58D} = {8814B724-617F-46D1-B29F-36C87F3472BF}
@ -213,6 +227,7 @@ Global
 		{31FB1B73-F4C5-414B-A27D-AB0DC194BC61} = {EB0E2713-EB72-4F68-B6CF-F076D68ECA40}
 		{0E701104-CD9A-45C0-8E32-3284DBDEAF5E} = {EB0E2713-EB72-4F68-B6CF-F076D68ECA40}
 		{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68} = {9D2825F8-4BEC-4D0A-B125-6390B554D519}
+		{1942083A-03D9-4D76-B644-A3FA2A118A35} = {3363D141-5FD1-4569-B1B0-EC59ABBA5FAC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5E5FE02E-6BCE-4BAF-9948-C56476039C3C}