From 1e9f3296ad6bf318da188b2efa5450a9d6e2d86b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 16 Oct 2007 05:58:45 +0000 Subject: [PATCH] fixed build --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401591 --- core/Makefile.ep1 | 2 +- core/Makefile.ep2 | 3 ++- core/Makefile.orig | 2 +- core/concmd_cleaner.cpp | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/Makefile.ep1 b/core/Makefile.ep1 index 1a0dc013..46064b72 100644 --- a/core/Makefile.ep1 +++ b/core/Makefile.ep1 @@ -24,7 +24,7 @@ OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreC sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \ sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \ MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp sm_crc32.cpp \ - frame_hooks.cpp + frame_hooks.cpp concmd_cleaner.cpp OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \ smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \ smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp \ diff --git a/core/Makefile.ep2 b/core/Makefile.ep2 index 5d59cbb0..4ee53df8 100644 --- a/core/Makefile.ep2 +++ b/core/Makefile.ep2 @@ -24,7 +24,7 @@ OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreC sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \ sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \ MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp sm_crc32.cpp \ - frame_hooks.cpp + frame_hooks.cpp bitbuf.cpp concmd_cleaner.cpp OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \ smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \ smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp \ @@ -81,6 +81,7 @@ all: mkdir -p $(BIN_DIR)/thread ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so + ln -sf $(HL2SDK)/tier1/bitbuf.cpp bitbuf.cpp $(MAKE) -f Makefile.ep2 sourcemod sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C) diff --git a/core/Makefile.orig b/core/Makefile.orig index 8d83e0c0..4b716371 100644 --- a/core/Makefile.orig +++ b/core/Makefile.orig @@ -24,7 +24,7 @@ OBJECTS = AdminCache.cpp CDataPack.cpp ConCmdManager.cpp ConVarManager.cpp CoreC sm_autonatives.cpp sm_memtable.cpp sm_srvcmds.cpp sm_stringutil.cpp sm_trie.cpp \ sourcemm_api.cpp sourcemod.cpp MenuStyle_Base.cpp MenuStyle_Valve.cpp MenuManager.cpp \ MenuStyle_Radio.cpp ChatTriggers.cpp ADTFactory.cpp MenuVoting.cpp sm_crc32.cpp \ - frame_hooks.cpp + frame_hooks.cpp concmd_cleaner.cpp OBJECTS += smn_admin.cpp smn_bitbuffer.cpp smn_console.cpp smn_core.cpp \ smn_datapacks.cpp smn_entities.cpp smn_events.cpp smn_fakenatives.cpp \ smn_filesystem.cpp smn_float.cpp smn_functions.cpp smn_gameconfigs.cpp smn_halflife.cpp \ diff --git a/core/concmd_cleaner.cpp b/core/concmd_cleaner.cpp index 094b5d65..0f376c18 100644 --- a/core/concmd_cleaner.cpp +++ b/core/concmd_cleaner.cpp @@ -59,12 +59,12 @@ public: #if defined ORANGEBOX_BUILD void OnSourceModAllInitialized() { - SH_ADD_HOOK(ICvar, UnregisterConCommand, SH_NOATTRIB, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false); + SH_ADD_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false); } void OnSourceModShutdown() { - SH_REMOVE_HOOK(ICvar, UnregisterConCommand, SH_NOATTRIB, SH_MEMBER(this, &ConCommandCleaner::UnlinkConCommandBase), false); + SH_REMOVE_HOOK_MEMFUNC(ICvar, UnregisterConCommand, icvar, this, &ConCommandCleaner::UnlinkConCommandBase, false); } #endif