diff options
| author | Joel de Vahl <joel@stalverk80.se> | 2008-10-08 16:33:08 +0000 |
|---|---|---|
| committer | Joel de Vahl <joel@stalverk80.se> | 2008-10-08 16:33:08 +0000 |
| commit | b74c2b79318779e69da88e7639b322b9a54d862c (patch) | |
| tree | a1d763e09fa56ea836270db67361a65af58867f0 /default.bam | |
| parent | 2b6f991010875e31184ddbc6c0917d13c02c7cbe (diff) | |
| download | zcatch-b74c2b79318779e69da88e7639b322b9a54d862c.tar.gz zcatch-b74c2b79318779e69da88e7639b322b9a54d862c.zip | |
Initial launcher (again)
Diffstat (limited to 'default.bam')
| -rw-r--r-- | default.bam | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/default.bam b/default.bam index cbe63fed..7f39ed73 100644 --- a/default.bam +++ b/default.bam @@ -315,6 +315,8 @@ 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_src = Collect("src/osxlaunch/*.m") objs = Compile(settings, tools_src) tools = {} @@ -337,9 +339,9 @@ function build(settings) masterserver_exe = Link(server_settings, "mastersrv", masterserver, engine, zlib) - --if platform == "macosx" then - -- osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch) - --end + if platform == "macosx" then + osxlaunch_exe = Link(client_settings, "osxlaunch", osxlaunch_src) + end -- make targets c = PseudoTarget("client".."_"..settings.config_name, client_exe) @@ -355,7 +357,7 @@ function build(settings) Target(t) if platform == "macosx" then - o = PseudoTarget("TeeLaunch".."_"..settings.config_name, osxlaunch_exe) + o = PseudoTarget("osxlaunch".."_"..settings.config_name, osxlaunch_exe) all = PseudoTarget(settings.config_name, c, s, v, m, t, o) else all = PseudoTarget(settings.config_name, c, s, v, m, t) |