1.1 --- a/core/Makefile.ep1 Sun Oct 14 19:34:46 2007 +0000
1.2 +++ b/core/Makefile.ep1 Sun Oct 14 19:48:26 2007 +0000
1.3 @@ -13,7 +13,7 @@
1.4 GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
1.5 DEBUG_FLAGS = -g -ggdb3
1.6 CPP = gcc-4.1
1.7 -BINARY = sourcemod_mm_i486.so
1.8 +BINARY = sourcemod.2.ep1.so
1.9
1.10 HL2PUB = $(HL2SDK)/public
1.11 HL2LIB = $(HL2SDK)/linux_sdk
1.12 @@ -82,8 +82,6 @@
1.13 ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
1.14 ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
1.15 $(MAKE) -f Makefile.ep1 sourcemod
1.16 - rm -rf $(BINARY)
1.17 - ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
1.18
1.19 sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
1.20 $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
2.1 --- a/core/Makefile.ep2 Sun Oct 14 19:34:46 2007 +0000
2.2 +++ b/core/Makefile.ep2 Sun Oct 14 19:48:26 2007 +0000
2.3 @@ -13,7 +13,7 @@
2.4 GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
2.5 DEBUG_FLAGS = -g -ggdb3
2.6 CPP = gcc-4.1
2.7 -BINARY = sourcemod_mm_i486.so
2.8 +BINARY = sourcemod.2.ep2.so
2.9
2.10 HL2PUB = $(HL2SDK)/public
2.11 HL2LIB = $(HL2SDK)/linux_sdk
2.12 @@ -81,15 +81,13 @@
2.13 mkdir -p $(BIN_DIR)/thread
2.14 ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
2.15 ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
2.16 - $(MAKE) -f Makefile.ep1 sourcemod
2.17 - rm -rf $(BINARY)
2.18 - ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
2.19 + $(MAKE) -f Makefile.ep2 sourcemod
2.20
2.21 sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
2.22 $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
2.23
2.24 debug:
2.25 - $(MAKE) -f Makefile.ep1 all DEBUG=true
2.26 + $(MAKE) -f Makefile.ep2 all DEBUG=true
2.27
2.28 default: all
2.29
3.1 --- a/core/Makefile.orig Sun Oct 14 19:34:46 2007 +0000
3.2 +++ b/core/Makefile.orig Sun Oct 14 19:48:26 2007 +0000
3.3 @@ -13,7 +13,7 @@
3.4 GCC4_CPP_FLAGS = -fvisibility-inlines-hidden
3.5 DEBUG_FLAGS = -g -ggdb3
3.6 CPP = gcc-4.1
3.7 -BINARY = sourcemod_mm_i486.so
3.8 +BINARY = sourcemod.1.ep1.so
3.9
3.10 HL2PUB = $(HL2SDK)/public
3.11 HL2LIB = $(HL2SDK)/linux_sdk
3.12 @@ -81,15 +81,13 @@
3.13 mkdir -p $(BIN_DIR)/thread
3.14 ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
3.15 ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
3.16 - $(MAKE) -f Makefile.ep1 sourcemod
3.17 - rm -rf $(BINARY)
3.18 - ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
3.19 + $(MAKE) -f Makefile.orig sourcemod
3.20
3.21 sourcemod: $(OBJ_LINUX) $(OBJ_LINUX_C)
3.22 $(CPP) $(INCLUDE) $(OBJ_LINUX) $(OBJ_LINUX_C) $(LINK) -shared -ldl -lm -o$(BIN_DIR)/$(BINARY)
3.23
3.24 debug:
3.25 - $(MAKE) -f Makefile.ep1 all DEBUG=true
3.26 + $(MAKE) -f Makefile.orig all DEBUG=true
3.27
3.28 default: all
3.29
4.1 --- a/core/smn_vector.cpp Sun Oct 14 19:34:46 2007 +0000
4.2 +++ b/core/smn_vector.cpp Sun Oct 14 19:48:26 2007 +0000
4.3 @@ -183,7 +183,7 @@
4.4
4.5 //:TODO: OMG remove this when we get the OB SDK!!1
4.6 // as well as bitbuf.cpp (i write it here just to remind it)
4.7 -#if defined ORANGEBOX_BUILD
4.8 +#if defined ORANGEBOX_BUILD && !defined __linux__
4.9 float ham(float _X)
4.10 {
4.11 return sqrt(_X);