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

Minor fixes so 1.6 builds with new Orange Box SDK

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40637
This commit is contained in:
Scott Ehlert 2008-02-17 09:19:52 +00:00
parent bc22b4622a
commit 441421dab6
7 changed files with 7 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sourcemm/Makefile.ep2
View File

@ -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"

8
sourcemm/episode2/msvc8/sourcemm.vcproj
View File

@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1"
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(HL2SDKOB)\tier1&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -63,7 +63,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier2.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
OutputFile="$(OutDir)/server.dll"
LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
@ -127,7 +127,7 @@
Optimization="3"
FavorSizeOrSpeed="1"
OmitFramePointers="true"
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;$(HL2SDKOB)\public;$(HL2SDKOB)\public\dlls;$(HL2SDKOB)\public\engine;$(HL2SDKOB)\public\tier0;$(HL2SDKOB)\public\tier1;$(HL2SDKOB)\public\vstdlib;$(HL2SDKOB)\tier1"
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;;&quot;$(HL2SDKOB)\tier1&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
StringPooling="true"
ExceptionHandling="1"
@ -150,7 +150,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier2.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
OutputFile="$(OutDir)/server.dll"
LinkIncremental="1"
IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"

8
sourcemm/episode2/provider_ep2.cpp
View File

@ -26,10 +26,6 @@
* Version: $Id$
*/
#if defined _DEBUG
#define DEBUG2
#undef _DEBUG
#endif
#include "../metamod_oslink.h"
#include <sourcehook.h>
#include <convar.h>
@ -44,10 +40,6 @@
#include "metamod_console.h"
#include "vsp_listener.h"
#include <filesystem.h>
#if defined DEBUG2
#undef DEBUG2
#define _DEBUG
#endif
/* Types */
typedef void (*CONPRINTF_FUNC)(const char *, ...);

10
sourcemm/episode2/vsp_listener.cpp
View File

@ -25,22 +25,14 @@
* Version: $Id$
*/
#if defined _DEBUG
#define DEBUG2
#undef _DEBUG
#endif
#include "../metamod_oslink.h"
#include "metamod.h"
#include <sourcehook.h>
#include <convar.h>
#include <eiface.h>
#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 &);

10
sourcemm/metamod.cpp
View File

@ -26,21 +26,13 @@
*/
#include "metamod_oslink.h"
#if defined _DEBUG
#define DEBUG2
#undef _DEBUG
#endif
#include "metamod.h"
#include <interface.h>
#include <eiface.h>
#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;

8
sourcemm/metamod_console.cpp
View File

@ -26,19 +26,11 @@
*/
#include "metamod_oslink.h"
#if defined _DEBUG
#define DEBUG2
#undef _DEBUG
#endif
#include <ctype.h>
#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;

8
sourcemm/metamod_plugins.cpp
View File

@ -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