diff --git a/r5dev/ClientSDK.def b/r5dev/ClientSDK.def new file mode 100644 index 00000000..ee720d59 --- /dev/null +++ b/r5dev/ClientSDK.def @@ -0,0 +1,4 @@ +LIBRARY client + +EXPORTS + DummyExport @1 diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp index 24eb80ca..f716985f 100644 --- 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(); diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp index cf138c04..b33475d1 100644 --- 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 tpPylonStartClock = std::chrono::steady_clock::now(); std::chrono::time_point 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 diff --git a/r5dev/engine/net_chan.cpp b/r5dev/engine/net_chan.cpp index 7e71cdd8..36f119e3 100644 --- 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 } /////////////////////////////////////////////////////////////////////////////// diff --git a/r5dev/gameui/IBrowser.cpp b/r5dev/gameui/IBrowser.cpp index 9a9fcdd4..1d38c709 100644 --- 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 } //----------------------------------------------------------------------------- diff --git a/r5dev/vproj/clientsdk.vcxproj b/r5dev/vproj/clientsdk.vcxproj new file mode 100644 index 00000000..e7ad5b18 --- /dev/null +++ b/r5dev/vproj/clientsdk.vcxproj @@ -0,0 +1,484 @@ + + + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NotUsing + NotUsing + + + NotUsing + NotUsing + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 16.0 + Win32Proj + {8FC77C68-CE93-45CE-B753-68ABE36BCDDB} + client + 10.0 + clientsdk + + + + DynamicLibrary + true + v143 + Unicode + Static + + + DynamicLibrary + false + v143 + true + Unicode + Static + + + + + + + + + + + + + + + + + true + $(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include + $(LibraryPath);$(DXSDK_DIR)Lib\x64 + client + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)build\$(ProjectName)\$(Configuration)\ + $(VC_ReferencesPath_x64); + + + false + $(SolutionDir)r5dev\;$(IncludePath);$(DXSDK_DIR)Include + $(LibraryPath);$(DXSDK_DIR)Lib\x64 + client + $(VC_ReferencesPath_x64); + $(SolutionDir)bin\$(Configuration)\ + $(SolutionDir)build\$(ProjectName)\$(Configuration)\ + + + + Level3 + true + _DEBUG;R5DEV_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + core\stdafx.h + + + stdcpp17 + stdc17 + /D GAMESDK /D GAMECLIENTONLY /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions) + + + Windows + true + false + ..\ClientSDK.def + d3d11.lib;bcrypt.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ + + + IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\client.dll" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + + + + + + + + Level3 + true + true + true + NDEBUG;R5DEV_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + Use + core\stdafx.h + Speed + + + true + true + AnySuitable + stdc17 + stdcpp17 + true + + + true + /D GAMESDK /D GAMECLIENTONLY /D _CRT_SECURE_NO_WARNINGS %(AdditionalOptions) + + + Windows + true + true + true + false + ..\ClientSDK.def + d3d11.lib;bcrypt.lib;libdetours_x64.lib;libimgui_x64.lib;liblzham_x64.lib;libprotobuf_x64.lib;%(AdditionalDependencies) + $(SolutionDir)lib\$(Configuration)\ + + + IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\client.dll" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + + + + + + + + + + \ No newline at end of file diff --git a/r5dev/vproj/clientsdk.vcxproj.filters b/r5dev/vproj/clientsdk.vcxproj.filters new file mode 100644 index 00000000..3a9464d3 --- /dev/null +++ b/r5dev/vproj/clientsdk.vcxproj.filters @@ -0,0 +1,1126 @@ + + + + + {5857edb8-da8e-491a-96a1-00a4fcfe3d38} + + + {8de4910c-a79a-4e5b-8da1-d6da52425492} + + + {d2a0971d-1de6-47f7-8a77-4246bc0cda3c} + + + {c00eb6b9-50b2-4fc3-9e24-d8f7ff601e0e} + + + {8caa20bd-7dea-4cb9-a69f-e90498e96a93} + + + {c069ad8a-c3be-4e61-afbf-f3eee3846d83} + + + {0b1b90e6-79f6-4b19-8f5e-aac20d346094} + + + {fb47caac-589a-490f-9a7d-00f53add78cc} + + + {4afffd57-c78e-420f-a0a7-863b04e64812} + + + {86b2ad0f-8709-48fa-8e92-0e9b8053ffce} + + + {09875779-c73f-4138-9ed5-14af2b9d8337} + + + {1dd9c7b9-1abc-412a-8e85-928c0d017beb} + + + {10a04e38-fd13-476b-92ea-ebbe60803ef6} + + + {7977cef5-28c7-40ca-be44-394d9f1b75de} + + + {3d8e58ec-0228-40ca-8ec8-66791a71bc08} + + + {4759136c-9b08-4e32-91a9-a71c62f019c1} + + + {c54c9382-0c06-4046-9e91-fb2a8019a22b} + + + {0ac635a8-3c25-4b4b-b382-1bb8bc882c55} + + + {db621634-f890-4852-b8dc-d540dffd433a} + + + {2fb19b52-f018-4e95-8eca-ed230132ce0b} + + + {d0a016cc-d3bc-449b-be29-29289dc550cb} + + + {47bf6838-c9bf-4429-b55a-9a00339c630f} + + + {510de005-f0c8-48b9-b274-2424ccf8f7c7} + + + {7cdf9989-f142-4f8a-a5ee-595fba1a354f} + + + {ce08331e-176d-4071-8564-2cbda5a09f34} + + + {a37df87a-dfda-47ab-a1be-1e49bdfecf44} + + + {a7469cda-54f2-4efc-8a58-6105c74845f9} + + + {f7c791f6-2cda-4702-88bd-458ea662e7ef} + + + {956f49fb-0d6a-47d6-96a0-9d616e47e5f2} + + + {698f4add-abac-46e5-a3f8-55d3a230b369} + + + {942b8ea5-ce53-4e1e-ad7a-845991aaead6} + + + {14a61eec-93ec-4e7c-b0bf-2ce23c3b782c} + + + {64bc6e43-c5e7-474f-be64-31df89e0034b} + + + {d914384a-56bc-4829-977b-5900f01b5612} + + + {336e3141-0276-4cd5-a836-585eef681b7b} + + + {55bb4f60-5f5a-4780-a7a2-b3db51c53680} + + + {f52dfb17-f5bd-4258-91a2-500587bee708} + + + {c5adc45b-d14c-4d52-9835-29948cab931a} + + + {b0696621-8658-4918-b0f2-ba20acc26829} + + + {cbe60970-f348-4a8b-8cee-d4cfebbe0d99} + + + {9da19829-c065-4584-9cf2-af751fb0d060} + + + {69f89031-0a48-4c3c-9ca8-c9a46f420e67} + + + {f26bcefd-b91a-4a1f-8b41-1124819c6e1d} + + + {cd141b6d-58a2-4b7d-afc9-32195cd9aa3c} + + + {75f3cdf7-cbe5-4138-90b1-24492f570abb} + + + {7fdf29d5-bc3d-41f4-8788-7ad63e4f9a13} + + + {9432e37b-2460-491e-96cb-ac0cfb477581} + + + {d82555e7-9f83-444b-ba0d-7e309e08ce73} + + + {5f9f0e7f-9bfb-4303-9bb6-fdce3bd23f23} + + + {3446634c-a632-4281-a500-459a56668a6b} + + + + + sdk\client + + + sdk\client + + + sdk\client + + + sdk\ebisusdk + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\gameui + + + sdk\gameui + + + sdk\public + + + sdk\public + + + sdk\rtech + + + sdk\rtech + + + sdk\inputsystem + + + sdk\launcher + + + sdk\squirrel + + + sdk\squirrel + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\vgui + + + sdk\vgui + + + sdk\vguimatsurface + + + sdk\vpc + + + sdk\vpc + + + sdk\vpc + + + sdk\vphysics + + + windows + + + windows + + + windows + + + core + + + core + + + core + + + sdk\common + + + sdk\mathlib + + + sdk\networksystem + + + sdk\squirrel + + + sdk\vpklib + + + sdk\public + + + sdk\bsplib + + + sdk\mathlib + + + sdk\mathlib + + + sdk\rtech + + + sdk\engine + + + windows + + + sdk\mathlib + + + sdk\tier0 + + + core + + + core + + + sdk\vpc + + + sdk\engine + + + sdk\engine + + + sdk\tier2 + + + sdk\tier1 + + + sdk\mathlib + + + sdk\engine + + + thirdparty\protobuf + + + thirdparty\protobuf + + + sdk\engine + + + sdk\engine + + + sdk\vgui + + + sdk\networksystem + + + thirdparty\imgui + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\materialsystem + + + sdk\materialsystem + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + + + sdk\client + + + sdk\client + + + sdk\client + + + sdk\common + + + sdk\ebisusdk + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\engine + + + sdk\gameui + + + sdk\gameui + + + sdk\public\include + + + sdk\public\include + + + sdk\public\include + + + sdk\public\include + + + sdk\public\include + + + sdk\rtech + + + sdk\rtech + + + sdk\inputsystem + + + sdk\inputsystem + + + sdk\launcher + + + sdk\mathlib + + + sdk\networksystem + + + sdk\squirrel + + + sdk\squirrel + + + thirdparty\detours\include + + + thirdparty\detours\include + + + thirdparty\detours\include + + + thirdparty\detours\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\imgui\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\sinks + + + thirdparty\spdlog\include\fmt + + + thirdparty\spdlog\include\fmt + + + thirdparty\spdlog\include\fmt + + + thirdparty\spdlog\include\fmt + + + thirdparty\spdlog\include\fmt + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\fmt\bundled + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\details + + + thirdparty\spdlog\include\cfg + + + thirdparty\spdlog\include\cfg + + + thirdparty\spdlog\include\cfg + + + thirdparty\spdlog\include\cfg + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\vgui + + + sdk\vgui + + + sdk\vgui + + + sdk\vguimatsurface + + + sdk\vpc + + + sdk\vpc + + + sdk\vpc + + + sdk\vpc + + + sdk\vphysics + + + windows + + + windows + + + windows + + + core + + + core + + + core + + + core + + + sdk\common + + + sdk\mathlib + + + sdk\networksystem + + + sdk\networksystem + + + sdk\mathlib + + + sdk\public\include + + + sdk\squirrel + + + core + + + sdk\tier0 + + + sdk\mathlib + + + sdk\vpklib + + + sdk\public\include + + + sdk\mathlib + + + sdk\bsplib + + + sdk\common + + + sdk\rtech + + + sdk\engine + + + windows + + + sdk\mathlib + + + sdk\materialsystem + + + sdk\engine + + + sdk\milessdk + + + sdk\mathlib + + + sdk\tier0 + + + core + + + core + + + sdk\engine + + + sdk\engine + + + sdk\mathlib + + + sdk\tier2 + + + sdk\tier1 + + + sdk\mathlib + + + sdk\common + + + sdk\engine + + + thirdparty\protobuf + + + thirdparty\protobuf + + + sdk\engine + + + sdk\engine + + + sdk\vgui + + + sdk\engine + + + sdk\engine + + + sdk\networksystem + + + sdk\studiorender + + + sdk\engine + + + sdk\engine + + + sdk\common + + + sdk\appframework + + + sdk\appframework + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\include + + + thirdparty\lzham\lzhamcomp\include + + + thirdparty\lzham\lzhamcomp\include + + + thirdparty\lzham\lzhamdecomp\include + + + thirdparty\lzham\lzhamdecomp\include + + + sdk\public\include + + + sdk\public\include + + + sdk\engine + + + sdk\materialsystem + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + sdk\tier0 + + + + + sdk\resource\png + + + + + sdk\resource + + + + + + \ No newline at end of file diff --git a/r5dev/vproj/gamesdk.vcxproj b/r5dev/vproj/gamesdk.vcxproj index c14dc023..1d3dccdb 100644 --- a/r5dev/vproj/gamesdk.vcxproj +++ b/r5dev/vproj/gamesdk.vcxproj @@ -445,7 +445,7 @@ $(SolutionDir)lib\$(Configuration)\ - IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\r5apexsdkd64.dll" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ @@ -487,7 +487,7 @@ $(SolutionDir)lib\$(Configuration)\ - IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\$(ProjectName)" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ + IF EXIST "$(SolutionDir)..\..\r5apex.exe" del "$(SolutionDir)..\..\r5apexsdkd64.dll" && copy /Y "$(TargetPath)" "$(SolutionDir)..\..\ diff --git a/r5sdk.sln b/r5sdk.sln index 710f1086..e0c51d8d 100644 --- 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}