diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-03-07 00:05:12 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-03-07 00:05:12 +0100 |
| commit | 66c44fc229bf8f2f029985a3d712c2518e4e38a9 (patch) | |
| tree | 9b35dee344f877709bcb050bd7b0ad55e25da081 /bam.lua | |
| parent | 44a47d4253a829abcf50dac5586fd9a351f0c66b (diff) | |
| parent | a42603ba43720b51ba8909d352fc2af88ebba2dd (diff) | |
| download | zcatch-66c44fc229bf8f2f029985a3d712c2518e4e38a9.tar.gz zcatch-66c44fc229bf8f2f029985a3d712c2518e4e38a9.zip | |
Merge remote-tracking branch 'heinrich5991/banmaster' into banmaster_v2
Conflicts: src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/config_variables.h src/engine/shared/network.h src/engine/shared/network_server.cpp
Diffstat (limited to 'bam.lua')
| -rw-r--r-- | bam.lua | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bam.lua b/bam.lua index da893e10..1626edab 100644 --- a/bam.lua +++ b/bam.lua @@ -232,6 +232,7 @@ function build(settings) versionserver = Compile(settings, Collect("src/versionsrv/*.cpp")) masterserver = Compile(settings, Collect("src/mastersrv/*.cpp")) + banmaster = Compile(settings, Collect("src/banmaster/*.cpp")) game_shared = Compile(settings, Collect("src/game/*.cpp"), nethash, network_source) game_client = Compile(settings, CollectRecursive("src/game/client/*.cpp"), client_content_source) game_server = Compile(settings, CollectRecursive("src/game/server/*.cpp"), server_content_source) @@ -272,6 +273,9 @@ function build(settings) masterserver_exe = Link(server_settings, "mastersrv", masterserver, engine, zlib) + banmaster_exe = Link(server_settings, "banmaster", banmaster, + engine, zlib) + -- make targets c = PseudoTarget("client".."_"..settings.config_name, client_exe, client_depends) s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch) @@ -279,9 +283,10 @@ function build(settings) v = PseudoTarget("versionserver".."_"..settings.config_name, versionserver_exe) m = PseudoTarget("masterserver".."_"..settings.config_name, masterserver_exe) + b = PseudoTarget("banmaster".."_"..settings.config_name, banmaster_exe) t = PseudoTarget("tools".."_"..settings.config_name, tools) - all = PseudoTarget(settings.config_name, c, s, v, m, t) + all = PseudoTarget(settings.config_name, c, s, v, m, b, t) return all end |