diff options
| author | Joel de Vahl <joel@stalverk80.se> | 2009-01-12 20:04:14 +0000 |
|---|---|---|
| committer | Joel de Vahl <joel@stalverk80.se> | 2009-01-12 20:04:14 +0000 |
| commit | 1d6668583a23b45724e9b107604c0dbfae433f10 (patch) | |
| tree | f1d9dea6a5002f58e93999c9dff8357f4ddd9abf /default.bam | |
| parent | baaf1bcf0d7422e967ed4c8638927d57ca8df45d (diff) | |
| download | zcatch-1d6668583a23b45724e9b107604c0dbfae433f10.tar.gz zcatch-1d6668583a23b45724e9b107604c0dbfae433f10.zip | |
initial server launcher for osx
Diffstat (limited to 'default.bam')
| -rw-r--r-- | default.bam | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/default.bam b/default.bam index a4902b4e..51bf0509 100644 --- a/default.bam +++ b/default.bam @@ -199,9 +199,11 @@ function build(settings) -- build tools (TODO: fix this so we don't get double _d_d stuff) tools_src = Collect("src/tools/*.cpp", "src/tools/*.c") - osxlaunch = {} + client_osxlaunch = {} + server_osxlaunch = {} if platform == "macosx" then - osxlaunch = Compile(client_settings, Collect("src/osxlaunch/*.m")) + client_osxlaunch = Compile(client_settings, "src/osxlaunch/client.m") + server_osxlaunch = Compile(client_settings, "src/osxlaunch/server.m") end tools = {} @@ -213,10 +215,15 @@ function build(settings) -- build client, server, version server and master server client_exe = Link(client_settings, "teeworlds", game_shared, game_client, engine, client, game_editor, zlib, pnglite, wavpack, - client_link_other, osxlaunch) + client_link_other, client_osxlaunch) server_exe = Link(server_settings, "teeworlds_srv", engine, server, game_shared, game_server, zlib) + + serverlaunch = {} + if platform == "macosx" then + serverlaunch = Link(client_settings, "serverlaunch", server_osxlaunch) + end versionserver_exe = Link(server_settings, "versionsrv", versionserver, engine, zlib) @@ -226,7 +233,7 @@ function build(settings) -- make targets c = PseudoTarget("client".."_"..settings.config_name, client_exe, client_depends) - s = PseudoTarget("server".."_"..settings.config_name, server_exe) + s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch) g = PseudoTarget("game".."_"..settings.config_name, client_exe, server_exe) v = PseudoTarget("versionserver".."_"..settings.config_name, versionserver_exe) |