From 230e4e3a324358c8eae27b8aadc43c95cb2017bf Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Fri, 8 Feb 2013 00:00:09 -0500 Subject: [PATCH] Build fix. --- extensions/sdkhooks/AMBuilder | 3 +-- extensions/sdkhooks/sdk/smsdk_config.h | 2 -- extensions/sdkhooks/takedamageinfohack.h | 10 ++-------- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/extensions/sdkhooks/AMBuilder b/extensions/sdkhooks/AMBuilder index 406584c5..89e3ff7c 100644 --- a/extensions/sdkhooks/AMBuilder +++ b/extensions/sdkhooks/AMBuilder @@ -7,8 +7,7 @@ for i in SM.sdkInfo: continue compiler = SM.DefaultHL2Compiler('extensions/sdkhooks', i) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit')) - compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'jit', 'x86')) + compiler['CXXINCLUDES'].append(os.path.join(AMBuild.cache[sdk['sdk']], 'game', 'shared')) if compiler.cc.name == 'gcc' or compiler.cc.name == 'clang': compiler['CFLAGS'].append('-Wno-parentheses') diff --git a/extensions/sdkhooks/sdk/smsdk_config.h b/extensions/sdkhooks/sdk/smsdk_config.h index 1277b819..cb211da7 100644 --- a/extensions/sdkhooks/sdk/smsdk_config.h +++ b/extensions/sdkhooks/sdk/smsdk_config.h @@ -32,8 +32,6 @@ #ifndef _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_ #define _INCLUDE_SOURCEMOD_EXTENSION_CONFIG_H_ -#include "version.h" - /** * @file smsdk_config.h * @brief Contains macros for configuring basic extension information. diff --git a/extensions/sdkhooks/takedamageinfohack.h b/extensions/sdkhooks/takedamageinfohack.h index 18f9c85c..abd1ac65 100644 --- a/extensions/sdkhooks/takedamageinfohack.h +++ b/extensions/sdkhooks/takedamageinfohack.h @@ -50,15 +50,9 @@ #define _DEBUG 1 #endif +#include + #include - -// Hack to server sdk util.h rather than project util.h -#if SOURCE_ENGINE >= SE_ORANGEBOX -#include <../game/server/util.h> -#else -#include <../dlls/util.h> -#endif - #include class CTakeDamageInfoHack : public CTakeDamageInfo