builds against new sourcehook now
authorDavid Anderson <dvander@alliedmods.net>
Mon Oct 08 17:22:57 2007 +0000 (2007-10-08)
changeset 39290c97c7ae9af
parent 391 32e7aee084a6
child 393 24e9ac80de6e
builds against new sourcehook now
sourcemm/Makefile.ep2
sourcemm/metamod.cpp
sourcemm/metamod.h
sourcemm/metamod_console.cpp
     1.1 --- a/sourcemm/Makefile.ep2	Mon Oct 08 17:17:34 2007 +0000
     1.2 +++ b/sourcemm/Makefile.ep2	Mon Oct 08 17:22:57 2007 +0000
     1.3 @@ -38,7 +38,7 @@
     1.4  CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
     1.5  	-Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
     1.6  	-Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse \
     1.7 -	-fno-strict-aliasing
     1.8 +	-fno-strict-aliasing -Wno-uninitialized
     1.9  
    1.10  ifeq "$(GCC_VERSION)" "4"
    1.11  	CFLAGS += $(GCC4_FLAGS)
    1.12 @@ -55,7 +55,7 @@
    1.13  	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
    1.14  	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
    1.15  	ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
    1.16 -	ln -sf $(HL2SDK)/tier1/convar.cpp episode2/convar.cpp
    1.17 +	ln -sf ../$(HL2SDK)/tier1/convar.cpp episode2/convar.cpp
    1.18  	$(MAKE) -f Makefile.ep2 sourcemm
    1.19  	rm -rf $(BINARY)
    1.20  	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
     2.1 --- a/sourcemm/metamod.cpp	Mon Oct 08 17:17:34 2007 +0000
     2.2 +++ b/sourcemm/metamod.cpp	Mon Oct 08 17:22:57 2007 +0000
     2.3 @@ -44,6 +44,7 @@
     2.4  
     2.5  using namespace SourceMM;
     2.6  using namespace SourceHook;
     2.7 +using namespace SourceHook::Impl;
     2.8  
     2.9  /**
    2.10   * @brief Implementation of main SourceMM GameDLL functionality
    2.11 @@ -92,8 +93,8 @@
    2.12  CreateInterfaceFn physics_factory = NULL;
    2.13  CreateInterfaceFn filesystem_factory = NULL;
    2.14  CGlobalVars *gpGlobals = NULL;
    2.15 -SourceHook::CSourceHookImpl g_SourceHook;
    2.16 -SourceHook::ISourceHook *g_SHPtr = &g_SourceHook;
    2.17 +CSourceHookImpl g_SourceHook;
    2.18 +ISourceHook *g_SHPtr = &g_SourceHook;
    2.19  PluginId g_PLID = Pl_Console;
    2.20  META_RES last_meta_res;
    2.21  IServerPluginCallbacks *vsp_callbacks = NULL;
     3.1 --- a/sourcemm/metamod.h	Mon Oct 08 17:17:34 2007 +0000
     3.2 +++ b/sourcemm/metamod.h	Mon Oct 08 17:22:57 2007 +0000
     3.3 @@ -101,7 +101,8 @@
     3.4  void LogMessage(const char *msg, ...);
     3.5  int LoadPluginsFromFile(const char *_file);
     3.6  
     3.7 -extern SourceHook::CSourceHookImpl g_SourceHook;
     3.8  extern MetamodSource g_Metamod;
     3.9 +extern SourceHook::Impl::CSourceHookImpl g_SourceHook;
    3.10  
    3.11  #endif //_INCLUDE_SOURCEMM_H
    3.12 +
     4.1 --- a/sourcemm/metamod_console.cpp	Mon Oct 08 17:17:34 2007 +0000
     4.2 +++ b/sourcemm/metamod_console.cpp	Mon Oct 08 17:22:57 2007 +0000
     4.3 @@ -73,7 +73,7 @@
     4.4  			CONMSG("Metamod:Source version %s\n", SOURCEMM_VERSION);
     4.5  			CONMSG("Compiled on: %s\n", SOURCEMM_DATE);
     4.6  			CONMSG("Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
     4.7 -			CONMSG("SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion());
     4.8 +			CONMSG("SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
     4.9  			CONMSG("http://www.sourcemm.net/\n");
    4.10  
    4.11  			return true;
    4.12 @@ -680,7 +680,7 @@
    4.13  				CLIENT_CONMSG(client, "Metamod:Source version %s\n", SOURCEMM_VERSION);
    4.14  				CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE);
    4.15  				CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
    4.16 -				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion());
    4.17 +				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
    4.18  				CLIENT_CONMSG(client, "http://www.sourcemm.net/\n");
    4.19  
    4.20  				return true;