Build stuff for L4D2 DLC (bug 4361, r=SAWCE)
authorFyren <fyrenmoo@gmail.com>
Fri Apr 23 11:39:12 2010 -0700 (2010-04-23)
changeset 29538238f91c0dc7
parent 2952 05508ba96f22
child 2954 3a95eff83df8
Build stuff for L4D2 DLC (bug 4361, r=SAWCE)
AMBuildScript
core/Makefile
extensions/sdktools/Makefile
     1.1 --- a/AMBuildScript	Fri Apr 23 14:22:41 2010 -0400
     1.2 +++ b/AMBuildScript	Fri Apr 23 11:39:12 2010 -0700
     1.3 @@ -201,7 +201,7 @@
     1.4  				staticLibs = os.path.join(sdkPath, 'lib', 'linux')
     1.5  			workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
     1.6  			if sdk == 'l4d2':
     1.7 -				for i in ['tier1_i486.a', 'mathlib_i486.a', 'vstdlib_linux.so', 'tier0_linux.so']:
     1.8 +				for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
     1.9  					link = os.path.join(workFolder, i)
    1.10  					target = os.path.join(staticLibs, i)
    1.11  					try:
    1.12 @@ -269,8 +269,8 @@
    1.13  			if AMBuild.target['platform'] == 'linux':
    1.14  				compiler['POSTLINKFLAGS'][0:0] = ['-lm']
    1.15  				if sdk == 'l4d2':
    1.16 -					compiler['POSTLINKFLAGS'][0:0] = ['tier0_linux.so']
    1.17 -					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_linux.so']
    1.18 +					compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
    1.19 +					compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
    1.20  				else:
    1.21  					compiler['POSTLINKFLAGS'][0:0] = ['tier0_i486.so']
    1.22  					compiler['POSTLINKFLAGS'][0:0] = ['vstdlib_i486.so']				
     2.1 --- a/core/Makefile	Fri Apr 23 14:22:41 2010 -0400
     2.2 +++ b/core/Makefile	Fri Apr 23 11:39:12 2010 -0700
     2.3 @@ -100,7 +100,7 @@
     2.4  	CFLAGS += -DSOURCE_ENGINE=6
     2.5  	METAMOD = $(MMSOURCE17)/core
     2.6  	INCLUDE += -I$(HL2SDK)/public/game/server
     2.7 -	SRCDS = $(SRCDS_BASE)/left4dead2_demo
     2.8 +	SRCDS = $(SRCDS_BASE)/left4dead2
     2.9  	BINARY = sourcemod.2.l4d2.so
    2.10  	override ENGSET = true
    2.11  endif
    2.12 @@ -108,8 +108,8 @@
    2.13  CFLAGS += -DSE_EPISODEONE=1 -DSE_DARKMESSIAH=2 -DSE_ORANGEBOX=3 -DSE_ORANGEBOXVALVE=4 -DSE_LEFT4DEAD=5 -DSE_LEFT4DEAD2=6
    2.14  
    2.15  ifeq "$(ENGINE)" "left4dead2"
    2.16 -LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_linux.so \
    2.17 -	tier0_linux.so -static-libgcc
    2.18 +LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a libvstdlib.so \
    2.19 +	libtier0.so -static-libgcc
    2.20  else
    2.21  LINK += $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so \
    2.22  	tier0_i486.so -static-libgcc
    2.23 @@ -154,8 +154,8 @@
    2.24  all: check
    2.25  	mkdir -p $(BIN_DIR)
    2.26  ifeq "$(ENGINE)" "left4dead2"
    2.27 -	ln -sf $(SRCDS)/bin/vstdlib_linux.so vstdlib_linux.so;
    2.28 -	ln -sf $(SRCDS)/bin/tier0_linux.so tier0_linux.so;
    2.29 +	ln -sf $(SRCDS)/bin/libvstdlib.so libvstdlib.so;
    2.30 +	ln -sf $(SRCDS)/bin/libtier0.so libtier0.so;
    2.31  else
    2.32  	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
    2.33  	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;
     3.1 --- a/extensions/sdktools/Makefile	Fri Apr 23 14:22:41 2010 -0400
     3.2 +++ b/extensions/sdktools/Makefile	Fri Apr 23 11:39:12 2010 -0700
     3.3 @@ -86,13 +86,13 @@
     3.4  	CFLAGS += -DSOURCE_ENGINE=6
     3.5  	METAMOD = $(MMSOURCE17)/core
     3.6  	INCLUDE += -I$(HL2SDK)/public/game/server -I$(HL2SDK)/common -I$(HL2SDK)/game/shared
     3.7 -	SRCDS = $(SRCDS_BASE)/left4dead2_demo
     3.8 +	SRCDS = $(SRCDS_BASE)/left4dead2
     3.9  	GAMEFIX = 2.l4d2
    3.10  	override ENGSET = true
    3.11  endif
    3.12  
    3.13  ifeq "$(ENGINE)" "left4dead2"
    3.14 -	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_linux.so tier0_linux.so
    3.15 +	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a libvstdlib.so libtier0.so
    3.16  else
    3.17  	LINK_HL2 = $(HL2LIB)/tier1_i486.a $(HL2LIB)/mathlib_i486.a vstdlib_i486.so tier0_i486.so
    3.18  endif
    3.19 @@ -150,8 +150,8 @@
    3.20  all: check
    3.21  	mkdir -p $(BIN_DIR)/sdk
    3.22  ifeq "$(ENGINE)" "left4dead2"
    3.23 -	ln -sf $(SRCDS)/bin/vstdlib_linux.so vstdlib_linux.so;
    3.24 -	ln -sf $(SRCDS)/bin/tier0_linux.so tier0_linux.so;
    3.25 +	ln -sf $(SRCDS)/bin/libvstdlib.so libvstdlib.so;
    3.26 +	ln -sf $(SRCDS)/bin/libtier0.so libtier0.so;
    3.27  else
    3.28  	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so;
    3.29  	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so;