From 441421dab6770896b33d68f3f33ff9242f664c64 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Sun, 17 Feb 2008 09:19:52 +0000 Subject: [PATCH] Minor fixes so 1.6 builds with new Orange Box SDK --HG-- extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40637 --- sourcemm/Makefile.ep2 | 2 +- sourcemm/episode2/msvc8/sourcemm.vcproj | 8 ++++---- sourcemm/episode2/provider_ep2.cpp | 8 -------- sourcemm/episode2/vsp_listener.cpp | 10 +--------- sourcemm/metamod.cpp | 10 +--------- sourcemm/metamod_console.cpp | 8 -------- sourcemm/metamod_plugins.cpp | 8 -------- 7 files changed, 7 insertions(+), 47 deletions(-) diff --git a/sourcemm/Makefile.ep2 b/sourcemm/Makefile.ep2 index 3f94b77..9c59210 100644 --- a/sourcemm/Makefile.ep2 +++ b/sourcemm/Makefile.ep2 @@ -21,7 +21,7 @@ OBJECTS = metamod.cpp metamod_util.cpp metamod_console.cpp metamod_oslink.cpp me LINK = $(HL2SDK)/linux_sdk/tier1_i486.a vstdlib_i486.so tier0_i486.so -static-libgcc -INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/dlls -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ +INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/game/server -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 \ -I$(HL2PUB)/vstdlib -I$(HL2SDK)/tier1 -I$(SMM_ROOT) -I$(SMM_ROOT)/sourcehook ifeq "$(DEBUG)" "true" diff --git a/sourcemm/episode2/msvc8/sourcemm.vcproj b/sourcemm/episode2/msvc8/sourcemm.vcproj index bf6914f..5a3ae02 100644 --- a/sourcemm/episode2/msvc8/sourcemm.vcproj +++ b/sourcemm/episode2/msvc8/sourcemm.vcproj @@ -41,7 +41,7 @@ #include @@ -44,10 +40,6 @@ #include "metamod_console.h" #include "vsp_listener.h" #include -#if defined DEBUG2 -#undef DEBUG2 -#define _DEBUG -#endif /* Types */ typedef void (*CONPRINTF_FUNC)(const char *, ...); diff --git a/sourcemm/episode2/vsp_listener.cpp b/sourcemm/episode2/vsp_listener.cpp index 137234c..263384c 100644 --- a/sourcemm/episode2/vsp_listener.cpp +++ b/sourcemm/episode2/vsp_listener.cpp @@ -25,22 +25,14 @@ * Version: $Id$ */ -#if defined _DEBUG -#define DEBUG2 -#undef _DEBUG -#endif #include "../metamod_oslink.h" +#include "metamod.h" #include #include #include #include "iplayerinfo.h" -#if defined DEBUG2 -#undef DEBUG2 -#define _DEBUG -#endif #include "vsp_listener.h" #include "svn_version.h" -#include "metamod.h" #include "provider_ep2.h" SH_DECL_HOOK1_void(ConCommand, Dispatch, SH_NOATTRIB, false, const CCommand &); diff --git a/sourcemm/metamod.cpp b/sourcemm/metamod.cpp index 4d58d06..9d8cf0d 100644 --- a/sourcemm/metamod.cpp +++ b/sourcemm/metamod.cpp @@ -26,21 +26,13 @@ */ #include "metamod_oslink.h" -#if defined _DEBUG -#define DEBUG2 -#undef _DEBUG -#endif +#include "metamod.h" #include #include -#include "metamod.h" #include "metamod_provider.h" #include "metamod_plugins.h" #include "metamod_util.h" #include "metamod_console.h" -#if defined DEBUG2 -#undef DEBUG2 -#define _DEBUG -#endif using namespace SourceMM; using namespace SourceHook; diff --git a/sourcemm/metamod_console.cpp b/sourcemm/metamod_console.cpp index 3b829ba..13adfd1 100644 --- a/sourcemm/metamod_console.cpp +++ b/sourcemm/metamod_console.cpp @@ -26,19 +26,11 @@ */ #include "metamod_oslink.h" -#if defined _DEBUG -#define DEBUG2 -#undef _DEBUG -#endif #include #include "metamod.h" #include "metamod_util.h" #include "metamod_console.h" #include "metamod_plugins.h" -#if defined DEBUG2 -#undef DEBUG2 -#define _DEBUG -#endif using namespace SourceMM; using namespace SourceHook; diff --git a/sourcemm/metamod_plugins.cpp b/sourcemm/metamod_plugins.cpp index f6e32fa..b5881b8 100644 --- a/sourcemm/metamod_plugins.cpp +++ b/sourcemm/metamod_plugins.cpp @@ -26,17 +26,9 @@ */ #include "metamod_oslink.h" -#if defined _DEBUG -#define DEBUG2 -#undef _DEBUG -#endif #include "metamod.h" #include "metamod_plugins.h" #include "metamod_util.h" -#if defined DEBUG2 -#undef DEBUG2 -#define _DEBUG -#endif /** * @brief Implements functions from CPlugin.h