diff --git a/sourcemm/Makefile.ep2 b/sourcemm/Makefile.ep2 new file mode 100644 index 0000000..d9fe514 --- /dev/null +++ b/sourcemm/Makefile.ep2 @@ -0,0 +1,78 @@ +#(C)2004-2007 SourceMM Development Team +# Makefile written by David "BAILOPAN" Anderson + +HL2SDK = ../../../hl2sdk-ob +SMM_ROOT = .. +SRCDS = ~/srcds + +### EDIT BELOW FOR OTHER PROJECTS ### + +OPT_FLAGS = -O2 -funroll-loops -s -pipe +GCC4_FLAGS = -fvisibility=hidden -fvisibility-inlines-hidden +DEBUG_FLAGS = -g -ggdb3 +CPP = gcc-4.1 +BINARY = server_i486.so + +HL2PUB = $(HL2SDK)/public +HL2LIB = $(HL2SDK)/linux_sdk + +OBJECTS = metamod.cpp metamod_util.cpp metamod_console.cpp metamod_oslink.cpp metamod_plugins.cpp \ + sourcehook.cpp episode2/console.cpp episode2/provider_ep2.cpp episode2/vsp_listener.cpp \ + episode2/convar.cpp + +LINK = vstdlib_i486.so tier0_i486.so -static-libgcc + +INCLUDE = -I. -I$(HL2PUB) -I$(HL2PUB)/dlls -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" + BIN_DIR = Debug + CFLAGS = $(DEBUG_FLAGS) +else + BIN_DIR = Release + CFLAGS = $(OPT_FLAGS) +endif + +GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1) + +CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \ + -Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \ + -Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse \ + -fno-strict-aliasing + +ifeq "$(GCC_VERSION)" "4" + CFLAGS += $(GCC4_FLAGS) +endif + +OBJ_LINUX := $(OBJECTS:%.cpp=$(BIN_DIR)/%.o) + +$(BIN_DIR)/%.o: %.cpp + $(CPP) $(INCLUDE) $(CFLAGS) -o $@ -c $< + +all: + mkdir -p $(BIN_DIR) + mkdir -p $(BIN_DIR)/episode2 + ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so + ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so + ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp + ln -sf $(HL2SDK)/tier1/convar.cpp episode2/convar.cpp + $(MAKE) -f Makefile.ep2 sourcemm + rm -rf $(BINARY) + ln -sf $(BIN_DIR)/$(BINARY) $(BINARY) + +sourcemm: $(OBJ_LINUX) + $(CPP) $(INCLUDE) $(CFLAGS) $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) + +debug: + $(MAKE) -f Makefile.ep2 all DEBUG=true + +default: all + +clean: + rm -rf Release/episode2/*.o + rm -rf Release/*.o + rm -rf Release/$(BINARY) + rm -rf Debug/episode2/*.o + rm -rf Debug/*.o + rm -rf Debug/$(BINARY) + diff --git a/sourcemm/episode2/console.cpp b/sourcemm/episode2/console.cpp index 61c7aef..ca0e9db 100644 --- a/sourcemm/episode2/console.cpp +++ b/sourcemm/episode2/console.cpp @@ -32,8 +32,6 @@ using namespace SourceHook; SMConVarAccessor g_SMConVarAccessor; -static int s_nDLLIdentifier = 0x3058132; // A unique identifier indicating which DLL this convar came from - bool SMConVarAccessor::RegisterConCommandBase(ConCommandBase *pCommand) { pCommand->SetNext(NULL);