diff --git a/sourcemm/Makefile.ep2 b/sourcemm/Makefile similarity index 91% rename from sourcemm/Makefile.ep2 rename to sourcemm/Makefile index 9c59210..34db7ea 100644 --- a/sourcemm/Makefile.ep2 +++ b/sourcemm/Makefile @@ -37,7 +37,7 @@ 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 -Wno-uninitialized + -fno-strict-aliasing -Wno-uninitialized -m32 ifeq "$(GCC_VERSION)" "4" CFLAGS += $(GCC4_FLAGS) @@ -57,15 +57,15 @@ all: ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp ln -sf $(SMM_ROOT)/sourcehook/sourcehook_hookmangen.cpp sourcehook_hookmangen.cpp - $(MAKE) -f Makefile.ep2 sourcemm + $(MAKE) -f Makefile 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) + $(CPP) $(INCLUDE) -m32 $(OBJ_LINUX) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY) debug: - $(MAKE) -f Makefile.ep2 all DEBUG=true + $(MAKE) -f Makefile all DEBUG=true default: all diff --git a/sourcemm/Makefile.ep1 b/sourcemm/Makefile.ep1 deleted file mode 100644 index 1f8abb0..0000000 --- a/sourcemm/Makefile.ep1 +++ /dev/null @@ -1,79 +0,0 @@ -#(C)2004-2007 Metamod:Source Development Team -# Makefile written by David "BAILOPAN" Anderson - -HL2SDK = ../../hl2sdk -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 sourcehook_hookmangen.cpp episode1/console.cpp episode1/provider_ep1.cpp episode1/vsp_listener.cpp - -LINK = $(HL2LIB)/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 \ - -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 \ - -Wno-uninitialized - -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)/episode1 - rm -f vstdlib_i486.so - rm -f tier0_i486.so - 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 $(SMM_ROOT)/sourcehook/sourcehook_hookmangen.cpp sourcehook_hookmangen.cpp - $(MAKE) -f Makefile.ep1 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.ep1 all DEBUG=true - -default: all - -clean: - rm -rf Release/episode1/*.o - rm -rf Release/*.o - rm -rf Release/$(BINARY) - rm -rf Debug/episode1/*.o - rm -rf Debug/*.o - rm -rf Debug/$(BINARY) -