mirror of
https://github.com/rehlds/rehlds.git
synced 2025-01-03 18:45:46 +03:00
Adjust public amalgamation on dedicated project. Add files to project.
This commit is contained in:
parent
46bf6e7af1
commit
5ea579d274
@ -1,4 +1,4 @@
|
|||||||
#include "ObjectList.h"
|
#include "precompiled.h"
|
||||||
|
|
||||||
ObjectList::ObjectList()
|
ObjectList::ObjectList()
|
||||||
{
|
{
|
||||||
@ -8,7 +8,7 @@ ObjectList::ObjectList()
|
|||||||
|
|
||||||
ObjectList::~ObjectList()
|
ObjectList::~ObjectList()
|
||||||
{
|
{
|
||||||
Clear(false);
|
ObjectList::Clear(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ObjectList::AddHead(void *newObject)
|
bool ObjectList::AddHead(void *newObject)
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
#include "precompiled.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "SteamAppStartup.h"
|
#include "SteamAppStartup.h"
|
||||||
|
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
#include "precompiled.h"
|
||||||
|
|
||||||
#if !defined(_WIN32)
|
#if !defined(_WIN32)
|
||||||
|
|
||||||
#include "TextConsoleUnix.h"
|
#include "TextConsoleUnix.h"
|
||||||
@ -15,7 +17,7 @@ CTextConsoleUnix console;
|
|||||||
|
|
||||||
CTextConsoleUnix::~CTextConsoleUnix()
|
CTextConsoleUnix::~CTextConsoleUnix()
|
||||||
{
|
{
|
||||||
ShutDown();
|
CTextConsoleUnix::ShutDown();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CTextConsoleUnix::Init(IBaseSystem *system)
|
bool CTextConsoleUnix::Init(IBaseSystem *system)
|
||||||
@ -76,8 +78,8 @@ void CTextConsoleUnix::ShutDown()
|
|||||||
{
|
{
|
||||||
sigset_t block_ttou;
|
sigset_t block_ttou;
|
||||||
|
|
||||||
sigemptyset(&block_ttou);
|
sigemptyset(&block_ttou);
|
||||||
sigaddset(&block_ttou, SIGTTOU);
|
sigaddset(&block_ttou, SIGTTOU);
|
||||||
sigprocmask(SIG_BLOCK, &block_ttou, NULL);
|
sigprocmask(SIG_BLOCK, &block_ttou, NULL);
|
||||||
tcsetattr(STDIN_FILENO, TCSANOW, &termStored);
|
tcsetattr(STDIN_FILENO, TCSANOW, &termStored);
|
||||||
sigprocmask(SIG_UNBLOCK, &block_ttou, NULL);
|
sigprocmask(SIG_UNBLOCK, &block_ttou, NULL);
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
|
#include "precompiled.h"
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#include "TextConsoleWin32.h"
|
|
||||||
|
|
||||||
CTextConsoleWin32 console;
|
CTextConsoleWin32 console;
|
||||||
|
|
||||||
@ -46,7 +47,7 @@ HWND GetConsoleHwnd()
|
|||||||
|
|
||||||
CTextConsoleWin32::~CTextConsoleWin32()
|
CTextConsoleWin32::~CTextConsoleWin32()
|
||||||
{
|
{
|
||||||
ShutDown();
|
CTextConsoleWin32::ShutDown();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CTextConsoleWin32::Init(IBaseSystem *system)
|
bool CTextConsoleWin32::Init(IBaseSystem *system)
|
||||||
@ -56,7 +57,7 @@ bool CTextConsoleWin32::Init(IBaseSystem *system)
|
|||||||
|
|
||||||
SetTitle(m_System ? m_System->GetName() : "Console");
|
SetTitle(m_System ? m_System->GetName() : "Console");
|
||||||
|
|
||||||
hinput = GetStdHandle(STD_INPUT_HANDLE);
|
hinput = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
houtput = GetStdHandle(STD_OUTPUT_HANDLE);
|
houtput = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
|
||||||
if (!SetConsoleCtrlHandler(&ConsoleHandlerRoutine, TRUE))
|
if (!SetConsoleCtrlHandler(&ConsoleHandlerRoutine, TRUE))
|
||||||
|
@ -1,8 +1,4 @@
|
|||||||
#include <stdio.h>
|
#include "precompiled.h"
|
||||||
#include <port.h>
|
|
||||||
|
|
||||||
#include "textconsole.h"
|
|
||||||
#include "ObjectList.h"
|
|
||||||
|
|
||||||
bool CTextConsole::Init(IBaseSystem *system)
|
bool CTextConsole::Init(IBaseSystem *system)
|
||||||
{
|
{
|
||||||
|
@ -87,25 +87,42 @@ model {
|
|||||||
srcDir "src"
|
srcDir "src"
|
||||||
include "**/*.cpp"
|
include "**/*.cpp"
|
||||||
exclude "precompiled.cpp"
|
exclude "precompiled.cpp"
|
||||||
|
|
||||||
if (GradleCppUtils.windows) {
|
if (GradleCppUtils.windows) {
|
||||||
exclude "sys_linux.cpp"
|
exclude "sys_linux.cpp"
|
||||||
} else {
|
} else {
|
||||||
exclude "sys_window.cpp", "conproc.cpp"
|
exclude "sys_window.cpp", "conproc.cpp"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
exportedHeaders {
|
exportedHeaders {
|
||||||
srcDirs "vgui"
|
srcDirs "vgui"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
dedicated_common(CppSourceSet) {
|
||||||
|
source {
|
||||||
|
srcDir "../common"
|
||||||
|
include "ObjectList.cpp"
|
||||||
|
include "SteamAppStartUp.cpp"
|
||||||
|
include "textconsole.cpp"
|
||||||
|
if (GradleCppUtils.windows) {
|
||||||
|
include "TextConsoleWin32.cpp"
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
include "TextConsoleUnix.cpp"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
dedicated_engine(CppSourceSet) {
|
||||||
|
source {
|
||||||
|
srcDir "../engine"
|
||||||
|
include "mem.cpp"
|
||||||
|
}
|
||||||
|
}
|
||||||
dedicated_pch(CppSourceSet) {
|
dedicated_pch(CppSourceSet) {
|
||||||
source {
|
source {
|
||||||
srcDir "src"
|
srcDir "src"
|
||||||
include "precompiled.cpp"
|
include "precompiled.cpp"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
rc {
|
rc {
|
||||||
source {
|
source {
|
||||||
srcDir "msvc"
|
srcDir "msvc"
|
||||||
|
@ -154,6 +154,15 @@
|
|||||||
<ResourceCompile Include="dedicated.rc" />
|
<ResourceCompile Include="dedicated.rc" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\common\ObjectList.cpp" />
|
||||||
|
<ClCompile Include="..\..\common\SteamAppStartUp.cpp" />
|
||||||
|
<ClCompile Include="..\..\common\textconsole.cpp" />
|
||||||
|
<ClCompile Include="..\..\common\TextConsoleUnix.cpp">
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
|
||||||
|
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\common\TextConsoleWin32.cpp" />
|
||||||
|
<ClCompile Include="..\..\engine\mem.cpp" />
|
||||||
<ClCompile Include="..\src\commandline.cpp" />
|
<ClCompile Include="..\src\commandline.cpp" />
|
||||||
<ClCompile Include="..\src\conproc.cpp" />
|
<ClCompile Include="..\src\conproc.cpp" />
|
||||||
<ClCompile Include="..\src\dbg.cpp" />
|
<ClCompile Include="..\src\dbg.cpp" />
|
||||||
|
@ -8,6 +8,12 @@
|
|||||||
<Filter Include="src\vgui">
|
<Filter Include="src\vgui">
|
||||||
<UniqueIdentifier>{711de26d-f116-48c0-96c0-5d4189574ad1}</UniqueIdentifier>
|
<UniqueIdentifier>{711de26d-f116-48c0-96c0-5d4189574ad1}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
|
<Filter Include="src\common">
|
||||||
|
<UniqueIdentifier>{c464f3ce-2fb5-4a0e-bda1-388b49b46871}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="src\engine">
|
||||||
|
<UniqueIdentifier>{565e56ff-60b6-4708-9749-010284e122a1}</UniqueIdentifier>
|
||||||
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="resource.h" />
|
<ClInclude Include="resource.h" />
|
||||||
@ -61,6 +67,24 @@
|
|||||||
<ClCompile Include="..\src\dedicated_exports.cpp">
|
<ClCompile Include="..\src\dedicated_exports.cpp">
|
||||||
<Filter>src</Filter>
|
<Filter>src</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\common\ObjectList.cpp">
|
||||||
|
<Filter>src\common</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\common\TextConsoleUnix.cpp">
|
||||||
|
<Filter>src\common</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\common\TextConsoleWin32.cpp">
|
||||||
|
<Filter>src\common</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\common\textconsole.cpp">
|
||||||
|
<Filter>src\common</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\common\SteamAppStartUp.cpp">
|
||||||
|
<Filter>src\common</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\..\engine\mem.cpp">
|
||||||
|
<Filter>src\engine</Filter>
|
||||||
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Image Include="icon.ico" />
|
<Image Include="icon.ico" />
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
#include "FileSystem.h"
|
#include "FileSystem.h"
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
|
#include "mem.h"
|
||||||
|
|
||||||
#include "engine_hlds_api.h"
|
#include "engine_hlds_api.h"
|
||||||
#include "idedicatedexports.h"
|
#include "idedicatedexports.h"
|
||||||
@ -16,6 +17,9 @@
|
|||||||
#include "textconsole.h"
|
#include "textconsole.h"
|
||||||
#include "vgui/vguihelpers.h"
|
#include "vgui/vguihelpers.h"
|
||||||
|
|
||||||
|
#include "IObjectContainer.h"
|
||||||
|
#include "ObjectList.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "conproc.h"
|
#include "conproc.h"
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
@ -1,11 +1,3 @@
|
|||||||
#include "precompiled.h"
|
#include "precompiled.h"
|
||||||
|
|
||||||
#include "mem.cpp"
|
|
||||||
#include "interface.cpp"
|
#include "interface.cpp"
|
||||||
#include "SteamAppStartUp.cpp"
|
|
||||||
|
|
||||||
#include "ObjectList.cpp"
|
|
||||||
|
|
||||||
#include "textconsole.cpp"
|
|
||||||
#include "TextConsoleUnix.cpp"
|
|
||||||
#include "TextConsoleWin32.cpp"
|
|
||||||
|
Loading…
Reference in New Issue
Block a user