diff options
| author | Joel de Vahl <joel@stalverk80.se> | 2009-01-13 21:02:02 +0000 |
|---|---|---|
| committer | Joel de Vahl <joel@stalverk80.se> | 2009-01-13 21:02:02 +0000 |
| commit | 2d4f220d8fb8d878c2f1750781ca6573d17bf8a9 (patch) | |
| tree | 6b3ccbf118b49536e082fe1dbe0baa07e0efe12c | |
| parent | 2d8c4a61b6cabd55a32744f8870ce3fa19041f77 (diff) | |
| download | zcatch-2d4f220d8fb8d878c2f1750781ca6573d17bf8a9.tar.gz zcatch-2d4f220d8fb8d878c2f1750781ca6573d17bf8a9.zip | |
fixed building of server launch (depended on SDL)
| -rw-r--r-- | default.bam | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/default.bam b/default.bam index 51bf0509..5544730d 100644 --- a/default.bam +++ b/default.bam @@ -164,6 +164,7 @@ function build(settings) engine_settings = settings:Copy() server_settings = engine_settings:Copy() client_settings = engine_settings:Copy() + launcher_settings = engine_settings:Copy() if family == "unix" then if platform == "macosx" then @@ -171,6 +172,7 @@ function build(settings) client_settings.link.frameworks:Add("AGL") client_settings.link.frameworks:Add("Carbon") client_settings.link.frameworks:Add("Cocoa") + launcher_settings.link.frameworks:Add("Cocoa") else client_settings.link.libs:Add("X11") client_settings.link.libs:Add("GL") @@ -203,7 +205,7 @@ function build(settings) server_osxlaunch = {} if platform == "macosx" then client_osxlaunch = Compile(client_settings, "src/osxlaunch/client.m") - server_osxlaunch = Compile(client_settings, "src/osxlaunch/server.m") + server_osxlaunch = Compile(launcher_settings, "src/osxlaunch/server.m") end tools = {} @@ -222,7 +224,7 @@ function build(settings) serverlaunch = {} if platform == "macosx" then - serverlaunch = Link(client_settings, "serverlaunch", server_osxlaunch) + serverlaunch = Link(launcher_settings, "serverlaunch", server_osxlaunch) end versionserver_exe = Link(server_settings, "versionsrv", versionserver, |