Merge.
1.1 --- a/AMBuildScript Thu Apr 29 01:28:11 2010 -0700
1.2 +++ b/AMBuildScript Thu Apr 29 01:28:27 2010 -0700
1.3 @@ -200,7 +200,7 @@
1.4 else:
1.5 staticLibs = os.path.join(sdkPath, 'lib', 'linux')
1.6 workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
1.7 - if sdk == 'l4d2':
1.8 + if sdk == 'ep2v' or sdk == 'l4d2':
1.9 for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']:
1.10 link = os.path.join(workFolder, i)
1.11 target = os.path.join(staticLibs, i)
1.12 @@ -268,7 +268,7 @@
1.13 if not noLink:
1.14 if AMBuild.target['platform'] == 'linux':
1.15 compiler['POSTLINKFLAGS'][0:0] = ['-lm']
1.16 - if sdk == 'l4d2':
1.17 + if sdk == 'ep2v' or sdk == 'l4d2':
1.18 compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
1.19 compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
1.20 else:
2.1 --- a/core/GameConfigs.cpp Thu Apr 29 01:28:11 2010 -0700
2.2 +++ b/core/GameConfigs.cpp Thu Apr 29 01:28:27 2010 -0700
2.3 @@ -557,7 +557,7 @@
2.4 void *handle = dlopen(info.dli_fname, RTLD_NOW);
2.5 if (handle)
2.6 {
2.7 -#if SOURCE_ENGINE == SE_LEFT4DEAD2
2.8 +#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
2.9 final_addr = g_MemUtils.ResolveSymbol(handle, &s_TempSig.sig[1]);
2.10 #else
2.11 final_addr = dlsym(handle, &s_TempSig.sig[1]);
3.1 --- a/extensions/sdktools/vcaller.cpp Thu Apr 29 01:28:11 2010 -0700
3.2 +++ b/extensions/sdktools/vcaller.cpp Thu Apr 29 01:28:27 2010 -0700
3.3 @@ -129,7 +129,7 @@
3.4 {
3.5 return 0;
3.6 }
3.7 -#if SOURCE_ENGINE == SE_LEFT4DEAD2
3.8 +#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2)
3.9 s_call_addr = memutils->ResolveSymbol(handle, &sig[1]);
3.10 #else
3.11 s_call_addr = dlsym(handle, &sig[1]);
4.1 --- a/gamedata/sdktools.games/game.dod.txt Thu Apr 29 01:28:11 2010 -0700
4.2 +++ b/gamedata/sdktools.games/game.dod.txt Thu Apr 29 01:28:27 2010 -0700
4.3 @@ -23,23 +23,23 @@
4.4 }
4.5 "RemovePlayerItem"
4.6 {
4.7 - "windows" "258"
4.8 - "linux" "259"
4.9 + "windows" "259"
4.10 + "linux" "260"
4.11 }
4.12 "Weapon_GetSlot"
4.13 {
4.14 - "windows" "256"
4.15 - "linux" "257"
4.16 + "windows" "257"
4.17 + "linux" "258"
4.18 }
4.19 "Ignite"
4.20 {
4.21 - "windows" "201"
4.22 - "linux" "202"
4.23 + "windows" "202"
4.24 + "linux" "203"
4.25 }
4.26 "Extinguish"
4.27 {
4.28 - "windows" "205"
4.29 - "linux" "206"
4.30 + "windows" "206"
4.31 + "linux" "207"
4.32 }
4.33 "Teleport"
4.34 {
4.35 @@ -53,13 +53,13 @@
4.36 }
4.37 "GetVelocity"
4.38 {
4.39 - "windows" "136"
4.40 - "linux" "137"
4.41 + "windows" "137"
4.42 + "linux" "138"
4.43 }
4.44 "EyeAngles"
4.45 {
4.46 - "windows" "127"
4.47 - "linux" "128"
4.48 + "windows" "128"
4.49 + "linux" "129"
4.50 }
4.51 "AcceptInput"
4.52 {
4.53 @@ -88,8 +88,8 @@
4.54 }
4.55 "WeaponEquip"
4.56 {
4.57 - "windows" "249"
4.58 - "linux" "250"
4.59 + "windows" "250"
4.60 + "linux" "251"
4.61 }
4.62 "Activate"
4.63 {
5.1 --- a/gamedata/sdktools.games/game.tf.txt Thu Apr 29 01:28:11 2010 -0700
5.2 +++ b/gamedata/sdktools.games/game.tf.txt Thu Apr 29 01:28:27 2010 -0700
5.3 @@ -28,18 +28,18 @@
5.4 }
5.5 "Weapon_GetSlot"
5.6 {
5.7 - "windows" "256"
5.8 - "linux" "257"
5.9 + "windows" "257"
5.10 + "linux" "258"
5.11 }
5.12 "Ignite"
5.13 {
5.14 - "windows" "201"
5.15 - "linux" "202"
5.16 + "windows" "202"
5.17 + "linux" "203"
5.18 }
5.19 "Extinguish"
5.20 {
5.21 - "windows" "205"
5.22 - "linux" "206"
5.23 + "windows" "206"
5.24 + "linux" "207"
5.25 }
5.26 "Teleport"
5.27 {
5.28 @@ -53,13 +53,13 @@
5.29 }
5.30 "GetVelocity"
5.31 {
5.32 - "windows" "136"
5.33 - "linux" "137"
5.34 + "windows" "137"
5.35 + "linux" "138"
5.36 }
5.37 "EyeAngles"
5.38 {
5.39 - "windows" "127"
5.40 - "linux" "128"
5.41 + "windows" "128"
5.42 + "linux" "129"
5.43 }
5.44 "DispatchKeyValue"
5.45 {
5.46 @@ -88,8 +88,8 @@
5.47 }
5.48 "WeaponEquip"
5.49 {
5.50 - "windows" "249"
5.51 - "linux" "250"
5.52 + "windows" "250"
5.53 + "linux" "251"
5.54 }
5.55 "Activate"
5.56 {
6.1 --- a/gamedata/sm-tf2.games.txt Thu Apr 29 01:28:11 2010 -0700
6.2 +++ b/gamedata/sm-tf2.games.txt Thu Apr 29 01:28:27 2010 -0700
6.3 @@ -86,8 +86,8 @@
6.4 {
6.5 "ForceRespawn"
6.6 {
6.7 - "windows" "312"
6.8 - "linux" "313"
6.9 + "windows" "313"
6.10 + "linux" "314"
6.11 }
6.12 }
6.13 }
