Merge branch 'master' of github.com:ivailosp/l4dtoolz

This commit is contained in:
Ivailo Spasov 2013-07-09 13:01:32 +03:00
commit dff2e0a087

View File

@ -35,7 +35,7 @@ CPP_OSX = clang
override ENGSET = false override ENGSET = false
# Check for valid list of engines # Check for valid list of engines
ifneq (,$(filter original orangebox orangeboxvalve css left4dead left4dead2 csgo,$(ENGINE))) ifneq (,$(filter left4dead left4dead2,$(ENGINE)))
override ENGSET = true override ENGSET = true
endif endif
@ -68,14 +68,19 @@ else
HL2LIB = $(HL2SDK)/lib/linux HL2LIB = $(HL2SDK)/lib/linux
endif endif
# if ENGINE is original or OB
ifneq (,$(filter original orangebox,$(ENGINE))) LIB_PREFIX = lib
LIB_SUFFIX = _i486.$(LIB_EXT) ifneq (,$(filter left4dead2,$(ENGINE)))
ifneq "$(OS)" "Darwin"
LIB_SUFFIX = _srv.$(LIB_EXT)
else
LIB_SUFFIX = .$(LIB_EXT)
endif
else else
LIB_PREFIX = lib
LIB_SUFFIX = .$(LIB_EXT) LIB_SUFFIX = .$(LIB_EXT)
endif endif
CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \ CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_BLOODYGOODTIME=4 -DSE_EYE=5 \
-DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \ -DSE_CSS=6 -DSE_ORANGEBOXVALVE=7 -DSE_LEFT4DEAD=8 -DSE_LEFT4DEAD2=9 -DSE_ALIENSWARM=10 \
-DSE_PORTAL2=11 -DSE_CSGO=12 -DSE_PORTAL2=11 -DSE_CSGO=12
@ -150,7 +155,7 @@ all: check
mkdir -p $(BIN_DIR) mkdir -p $(BIN_DIR)
ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX) ln -sf $(HL2LIB)/$(LIB_PREFIX)vstdlib$(LIB_SUFFIX)
ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX) ln -sf $(HL2LIB)/$(LIB_PREFIX)tier0$(LIB_SUFFIX)
$(MAKE) -f Makefile stub_mm $(MAKE) -f Makefile l4dtoolz_mm
check: check:
if [ "$(ENGSET)" = "false" ]; then \ if [ "$(ENGSET)" = "false" ]; then \
@ -159,7 +164,7 @@ check:
exit 1; \ exit 1; \
fi fi
stub_mm: check $(OBJ_BIN) l4dtoolz_mm: check $(OBJ_BIN)
$(CPP) $(INCLUDE) -m32 $(OBJ_BIN) $(LINK) -ldl -lm -o $(BIN_DIR)/$(BINARY) $(CPP) $(INCLUDE) -m32 $(OBJ_BIN) $(LINK) -ldl -lm -o $(BIN_DIR)/$(BINARY)
default: all default: all