nullprop/hl2sdk-starter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unnecessary includes

Browse source
This commit is contained in:
Lauri Räsänen 2024-04-27 14:21:18 +03:00
parent cd23f8b665
commit c64144571e
2 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
meson.build
View file

@ -163,10 +163,10 @@ sdk_includes = include_directories([
'include/hl2sdk/public/engine', 'include/hl2sdk/public/engine',
'include/hl2sdk/public/game/client', 'include/hl2sdk/public/game/client',
'include/hl2sdk/public/game/server', 'include/hl2sdk/public/game/server',
'include/hl2sdk/public/mathlib',
'include/hl2sdk/public/tier0', 'include/hl2sdk/public/tier0',
'include/hl2sdk/public/tier1', 'include/hl2sdk/public/tier1',
'include/hl2sdk/public/tier2', 'include/hl2sdk/public/vstdlib',
'include/hl2sdk/public/tier3',
]) ])
# SDK libraries # SDK libraries
@ -178,8 +178,6 @@ if host_system == 'windows'
cpp.find_library('mathlib', dirs: [dir_x86], required: true), cpp.find_library('mathlib', dirs: [dir_x86], required: true),
cpp.find_library('tier0', dirs: [dir_x86], required: true), cpp.find_library('tier0', dirs: [dir_x86], required: true),
cpp.find_library('tier1', dirs: [dir_x86], required: true), cpp.find_library('tier1', dirs: [dir_x86], required: true),
cpp.find_library('tier2', dirs: [dir_x86], required: true),
cpp.find_library('tier3', dirs: [dir_x86], required: true),
cpp.find_library('vstdlib', dirs: [dir_x86], required: true), cpp.find_library('vstdlib', dirs: [dir_x86], required: true),
] ]
elif arch == 'x64' elif arch == 'x64'
@ -197,20 +195,18 @@ elif host_system == 'linux'
if arch == 'x86' if arch == 'x86'
dir_x86 = join_paths(meson.current_source_dir(), 'include/hl2sdk/lib/linux') dir_x86 = join_paths(meson.current_source_dir(), 'include/hl2sdk/lib/linux')
sdk_deps += [ sdk_deps += [
cpp.find_library('tier0_srv', dirs: [dir_x86], required: true),
cpp.find_library('vstdlib_srv', dirs: [dir_x86], required: true),
cpp.find_library('mathlib_i486', dirs: [dir_x86], required: true), cpp.find_library('mathlib_i486', dirs: [dir_x86], required: true),
cpp.find_library('tier0_srv', dirs: [dir_x86], required: true),
cpp.find_library('tier1_i486', dirs: [dir_x86], required: true), cpp.find_library('tier1_i486', dirs: [dir_x86], required: true),
cpp.find_library('tier2_i486', dirs: [dir_x86], required: true), cpp.find_library('vstdlib_srv', dirs: [dir_x86], required: true),
cpp.find_library('tier3_i486', dirs: [dir_x86], required: true),
] ]
elif arch == 'x64' elif arch == 'x64'
dir_x64 = join_paths(meson.current_source_dir(), 'include/hl2sdk/lib/linux64') dir_x64 = join_paths(meson.current_source_dir(), 'include/hl2sdk/lib/linux64')
sdk_deps += [ sdk_deps += [
cpp.find_library('tier0_srv', dirs: [dir_x64], required: true),
cpp.find_library('vstdlib_srv', dirs: [dir_x64], required: true),
cpp.find_library('mathlib', dirs: [dir_x64], required: true), cpp.find_library('mathlib', dirs: [dir_x64], required: true),
cpp.find_library('tier0_srv', dirs: [dir_x64], required: true),
cpp.find_library('tier1', dirs: [dir_x64], required: true), cpp.find_library('tier1', dirs: [dir_x64], required: true),
cpp.find_library('vstdlib_srv', dirs: [dir_x64], required: true),
] ]
else else
error('Unsupported host system "@0@" and arch "@1@" for libraries') error('Unsupported host system "@0@" and arch "@1@" for libraries')

3
src/ServerPlugin.cpp
View file

@ -1,6 +1,5 @@
#include "ServerPlugin.h" #include "ServerPlugin.h"
#include "tier1.h" #include "tier1.h"
#include "tier2.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"
@ -16,7 +15,6 @@ EXPOSE_SINGLE_INTERFACE_GLOBALVAR(
bool ServerPlugin::Load(CreateInterfaceFn engineFactory, CreateInterfaceFn serverFactory) bool ServerPlugin::Load(CreateInterfaceFn engineFactory, CreateInterfaceFn serverFactory)
{ {
ConnectTier1Libraries(&engineFactory, 1); ConnectTier1Libraries(&engineFactory, 1);
// ConnectTier2Libraries(&engineFactory, 1);
m_engineInterfaces = EngineInterfaces(engineFactory, serverFactory); m_engineInterfaces = EngineInterfaces(engineFactory, serverFactory);
if (!m_engineInterfaces.IsValid()) if (!m_engineInterfaces.IsValid())
@ -45,7 +43,6 @@ void ServerPlugin::Unload()
} }
ConVar_Unregister(); ConVar_Unregister();
// DisconnectTier2Libraries();
DisconnectTier1Libraries(); DisconnectTier1Libraries();
} }