rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2024-12-01 13:24:25 +01:00
Code Issues Releases Activity

builds against new sourcehook now

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40477
This commit is contained in:
David Anderson 2007-10-08 17:22:57 +00:00
parent 23239dec9c
commit c057421fca
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sourcemm/Makefile.ep2
View File

@ -38,7 +38,7 @@ GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
-Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
-Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse \ -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse \
-fno-strict-aliasing -fno-strict-aliasing -Wno-uninitialized
ifeq "$(GCC_VERSION)" "4" ifeq "$(GCC_VERSION)" "4"
CFLAGS += $(GCC4_FLAGS) CFLAGS += $(GCC4_FLAGS)
@ -55,7 +55,7 @@ all:
ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
ln -sf $(HL2SDK)/tier1/convar.cpp episode2/convar.cpp ln -sf ../$(HL2SDK)/tier1/convar.cpp episode2/convar.cpp
$(MAKE) -f Makefile.ep2 sourcemm $(MAKE) -f Makefile.ep2 sourcemm
rm -rf $(BINARY) rm -rf $(BINARY)
ln -sf $(BIN_DIR)/$(BINARY) $(BINARY) ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)

5
sourcemm/metamod.cpp
View File

@ -44,6 +44,7 @@
using namespace SourceMM; using namespace SourceMM;
using namespace SourceHook; using namespace SourceHook;
using namespace SourceHook::Impl;
/** /**
* @brief Implementation of main SourceMM GameDLL functionality * @brief Implementation of main SourceMM GameDLL functionality
@ -92,8 +93,8 @@ CreateInterfaceFn engine_factory = NULL;
CreateInterfaceFn physics_factory = NULL; CreateInterfaceFn physics_factory = NULL;
CreateInterfaceFn filesystem_factory = NULL; CreateInterfaceFn filesystem_factory = NULL;
CGlobalVars *gpGlobals = NULL; CGlobalVars *gpGlobals = NULL;
SourceHook::CSourceHookImpl g_SourceHook; CSourceHookImpl g_SourceHook;
SourceHook::ISourceHook *g_SHPtr = &g_SourceHook; ISourceHook *g_SHPtr = &g_SourceHook;
PluginId g_PLID = Pl_Console; PluginId g_PLID = Pl_Console;
META_RES last_meta_res; META_RES last_meta_res;
IServerPluginCallbacks *vsp_callbacks = NULL; IServerPluginCallbacks *vsp_callbacks = NULL;

3
sourcemm/metamod.h
View File

@ -101,7 +101,8 @@ public:
void LogMessage(const char *msg, ...); void LogMessage(const char *msg, ...);
int LoadPluginsFromFile(const char *_file); int LoadPluginsFromFile(const char *_file);
extern SourceHook::CSourceHookImpl g_SourceHook;
extern MetamodSource g_Metamod; extern MetamodSource g_Metamod;
extern SourceHook::Impl::CSourceHookImpl g_SourceHook;
#endif //_INCLUDE_SOURCEMM_H #endif //_INCLUDE_SOURCEMM_H

4
sourcemm/metamod_console.cpp
View File

@ -73,7 +73,7 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
CONMSG("Metamod:Source version %s\n", SOURCEMM_VERSION); CONMSG("Metamod:Source version %s\n", SOURCEMM_VERSION);
CONMSG("Compiled on: %s\n", SOURCEMM_DATE); CONMSG("Compiled on: %s\n", SOURCEMM_DATE);
CONMSG("Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION); CONMSG("Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
CONMSG("SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion()); CONMSG("SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
CONMSG("http://www.sourcemm.net/\n"); CONMSG("http://www.sourcemm.net/\n");
return true; return true;
@ -680,7 +680,7 @@ bool Command_ClientMeta(edict_t *client, IMetamodSourceCommandInfo *info)
CLIENT_CONMSG(client, "Metamod:Source version %s\n", SOURCEMM_VERSION); CLIENT_CONMSG(client, "Metamod:Source version %s\n", SOURCEMM_VERSION);
CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE); CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE);
CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION); CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion()); CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
CLIENT_CONMSG(client, "http://www.sourcemm.net/\n"); CLIENT_CONMSG(client, "http://www.sourcemm.net/\n");
return true; return true;