From 9023afff0da8c9a6740f40539507f32d44d71606 Mon Sep 17 00:00:00 2001 From: Scott Ehlert Date: Tue, 13 May 2008 08:22:49 +0000 Subject: [PATCH] Trunk build fixes Fixed up IGameHelpers.h such that it no longer requires HL2SDK headers if a function doesn't need them --HG-- extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402144 --- core/HalfLife2.h | 2 + core/smn_entities.cpp | 1 - extensions/clientprefs/Makefile | 4 +- extensions/clientprefs/extension.h | 2 + extensions/clientprefs/msvc8/clientprefs.sln | 18 - .../clientprefs/msvc8/clientprefs.vcproj | 507 +----------------- extensions/clientprefs/msvc9/clientprefs.sln | 18 - .../clientprefs/msvc9/clientprefs.vcproj | 489 +---------------- extensions/sdktools/extension.h | 2 + extensions/tf2/extension.h | 1 + public/IGameHelpers.h | 17 +- tools/builder/PkgCore.cs | 1 - 12 files changed, 31 insertions(+), 1031 deletions(-) diff --git a/core/HalfLife2.h b/core/HalfLife2.h index ba61c31e0..799fe131d 100644 --- a/core/HalfLife2.h +++ b/core/HalfLife2.h @@ -41,6 +41,8 @@ #include "sm_queue.h" #include #include +#include +#include class CCommand; diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp index 2a6d91a06..bb29d7fd8 100644 --- a/core/smn_entities.cpp +++ b/core/smn_entities.cpp @@ -32,7 +32,6 @@ #include "sm_globals.h" #include "sourcemod.h" #include "sourcemm_api.h" -#include "server_class.h" #include "PlayerManager.h" #include "HalfLife2.h" #include "GameConfigs.h" diff --git a/extensions/clientprefs/Makefile b/extensions/clientprefs/Makefile index 7dfe73678..55aa55bac 100644 --- a/extensions/clientprefs/Makefile +++ b/extensions/clientprefs/Makefile @@ -59,8 +59,8 @@ ifeq "$(USEMETA)" "true" -I$(METAMOD) -I$(METAMOD)/sourcehook -I$(METAMOD)/sourcemm -I$(SMSDK)/public \ -I$(SMSDK)/public/sourcepawn else - INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SOURCEMM16)/sourcehook \ - -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 + INCLUDE += -I. -I.. -Isdk -I$(SMSDK)/public -I$(SMSDK)/public/sourcepawn -I$(SMSDK)/public/extensions \ + -I$(SOURCEMM16)/sourcehook endif LINK += -static-libgcc diff --git a/extensions/clientprefs/extension.h b/extensions/clientprefs/extension.h index dea64b434..330ce3c97 100644 --- a/extensions/clientprefs/extension.h +++ b/extensions/clientprefs/extension.h @@ -34,6 +34,8 @@ #define MAXCLIENTS 64 +#include +#include #include "smsdk_ext.h" #include "sh_list.h" #include "cookie.h" diff --git a/extensions/clientprefs/msvc8/clientprefs.sln b/extensions/clientprefs/msvc8/clientprefs.sln index d437656f9..149aec170 100644 --- a/extensions/clientprefs/msvc8/clientprefs.sln +++ b/extensions/clientprefs/msvc8/clientprefs.sln @@ -5,30 +5,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientprefs", "clientprefs. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - Episode 1|Win32 = Debug - Episode 1|Win32 - Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32 - Debug - Orange Box|Win32 = Debug - Orange Box|Win32 Debug|Win32 = Debug|Win32 - Release - Episode 1|Win32 = Release - Episode 1|Win32 - Release - Old Metamod|Win32 = Release - Old Metamod|Win32 - Release - Orange Box|Win32 = Release - Orange Box|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode 1|Win32.ActiveCfg = Debug - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode 1|Win32.Build.0 = Debug - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.ActiveCfg = Debug|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.Build.0 = Debug|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.ActiveCfg = Release|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/extensions/clientprefs/msvc8/clientprefs.vcproj b/extensions/clientprefs/msvc8/clientprefs.vcproj index 03dcef965..47d6402a2 100644 --- a/extensions/clientprefs/msvc8/clientprefs.vcproj +++ b/extensions/clientprefs/msvc8/clientprefs.vcproj @@ -40,8 +40,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -690,10 +205,6 @@ RelativePath="..\query.cpp" > - - diff --git a/extensions/clientprefs/msvc9/clientprefs.sln b/extensions/clientprefs/msvc9/clientprefs.sln index 124b4274e..07e37e2cc 100644 --- a/extensions/clientprefs/msvc9/clientprefs.sln +++ b/extensions/clientprefs/msvc9/clientprefs.sln @@ -5,30 +5,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clientprefs", "clientprefs. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug - Episode 1|Win32 = Debug - Episode 1|Win32 - Debug - Old Metamod|Win32 = Debug - Old Metamod|Win32 - Debug - Orange Box|Win32 = Debug - Orange Box|Win32 Debug|Win32 = Debug|Win32 - Release - Episode 1|Win32 = Release - Episode 1|Win32 - Release - Old Metamod|Win32 = Release - Old Metamod|Win32 - Release - Orange Box|Win32 = Release - Orange Box|Win32 Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode 1|Win32.ActiveCfg = Debug - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Episode 1|Win32.Build.0 = Debug - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.ActiveCfg = Debug - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Old Metamod|Win32.Build.0 = Debug - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.ActiveCfg = Debug|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Debug|Win32.Build.0 = Debug|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.ActiveCfg = Release - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Episode 1|Win32.Build.0 = Release - Episode 1|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.ActiveCfg = Release - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Old Metamod|Win32.Build.0 = Release - Old Metamod|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32 - {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.ActiveCfg = Release|Win32 {B3E797CF-4E77-4C9D-B8A8-7589B6902206}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection diff --git a/extensions/clientprefs/msvc9/clientprefs.vcproj b/extensions/clientprefs/msvc9/clientprefs.vcproj index 437c78bc1..45317ce2f 100644 --- a/extensions/clientprefs/msvc9/clientprefs.vcproj +++ b/extensions/clientprefs/msvc9/clientprefs.vcproj @@ -41,8 +41,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #include #include +#include +#include #include #include #include diff --git a/extensions/tf2/extension.h b/extensions/tf2/extension.h index ebb3ae10b..2f31e0034 100644 --- a/extensions/tf2/extension.h +++ b/extensions/tf2/extension.h @@ -39,6 +39,7 @@ #include "smsdk_ext.h" #include +#include /** * @brief Sample implementation of the SDK Extension. diff --git a/public/IGameHelpers.h b/public/IGameHelpers.h index 9bc373bc6..80f38733d 100644 --- a/public/IGameHelpers.h +++ b/public/IGameHelpers.h @@ -33,19 +33,22 @@ #define _INCLUDE_SOURCEMOD_GAMEHELPERS_H_ #include -#include -#include -#include -#include - -#define SMINTERFACE_GAMEHELPERS_NAME "IGameHelpers" -#define SMINTERFACE_GAMEHELPERS_VERSION 2 /** * @file IGameHelpers.h * @brief Provides Source helper functions. */ +#define SMINTERFACE_GAMEHELPERS_NAME "IGameHelpers" +#define SMINTERFACE_GAMEHELPERS_VERSION 2 + +class CBaseEntity; +class SendProp; +class ServerClass; +struct edict_t; +struct datamap_t; +struct typedescription_t; + namespace SourceMod { /** diff --git a/tools/builder/PkgCore.cs b/tools/builder/PkgCore.cs index d692116e2..60b2cf030 100644 --- a/tools/builder/PkgCore.cs +++ b/tools/builder/PkgCore.cs @@ -282,7 +282,6 @@ namespace builder lib.source_path = "extensions/clientprefs"; lib.binary_name = "clientprefs.ext"; lib.vcproj_name = "clientprefs"; - lib.build_mode = BuildMode.BuildMode_Episode2; libraries.Add(lib); return (Library [])libraries.ToArray(typeof(Library));