diff -r 9a569e62130d -r 29b113bf1c9e core/Makefile --- a/core/Makefile Mon Jan 11 20:00:01 2010 -0800 +++ b/core/Makefile Fri Apr 23 16:55:51 2010 -0400 @@ -42,7 +42,7 @@ INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/orangebox BINARY = metamod.2.ep2.so - LIB_SUFFIX = i486 + LIB_SUFFIX = _i486.so override ENGSET = true endif ifeq "$(ENGINE)" "orangeboxvalve" @@ -53,7 +53,7 @@ INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/orangebox BINARY = metamod.2.ep2v.so - LIB_SUFFIX = i486 + LIB_SUFFIX = _i486.so override ENGSET = true endif ifeq "$(ENGINE)" "left4dead" @@ -64,7 +64,7 @@ INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/l4d BINARY = metamod.2.l4d.so - LIB_SUFFIX = i486 + LIB_SUFFIX = _i486.so override ENGSET = true endif ifeq "$(ENGINE)" "left4dead2" @@ -75,13 +75,15 @@ INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/left4dead2_demo BINARY = metamod.2.l4d2.so - LIB_SUFFIX = linux + LIB_PREFIX = lib + LIB_SUFFIX = .so override ENGSET = true endif CFLAGS += -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6 -LINK += $(HL2LIB)/tier1_i486.a vstdlib_$(LIB_SUFFIX).so tier0_$(LIB_SUFFIX).so -static-libgcc +LINK += $(HL2LIB)/tier1_i486.a $(LIB_PREFIX)vstdlib$(LIB_SUFFIX) $(LIB_PREFIX)tier0$(LIB_SUFFIX) \ + -static-libgcc INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \ -I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -Isourcehook -I../loader @@ -122,8 +124,8 @@ mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)/provider mkdir -p $(BIN_DIR)/sourcehook - ln -sf $(HL2LIB)/vstdlib_$(LIB_SUFFIX).so - ln -sf $(HL2LIB)/tier0_$(LIB_SUFFIX).so + ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX) + ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX) $(MAKE) -f Makefile metamod check: