about summary refs log tree commit diff
path: root/default.bam
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-12 15:07:57 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-01-12 15:07:57 +0000
commit99f0a47d6b03b005d0a7dae064cb6eb7cb4f60b5 (patch)
tree6c453bff72668da6cc6f6e28621356004a06d441 /default.bam
parent2aba180f8c1bfa2680b1f660148de1dc82b03298 (diff)
downloadzcatch-99f0a47d6b03b005d0a7dae064cb6eb7cb4f60b5.tar.gz
zcatch-99f0a47d6b03b005d0a7dae064cb6eb7cb4f60b5.zip
first round of code cleanup
Diffstat (limited to 'default.bam')
-rw-r--r--default.bam4
1 files changed, 2 insertions, 2 deletions
diff --git a/default.bam b/default.bam
index 4007b77b..02c7e9b2 100644
--- a/default.bam
+++ b/default.bam
@@ -262,7 +262,7 @@ function build(settings)
 	game_shared = Compile(settings, Collect("src/game/*.cpp"), nethash)
 	game_client = Compile(settings, Collect("src/game/client/*.cpp"), clientdata.source, clientdata.cdata)
 	game_server = Compile(settings, Collect("src/game/server/*.cpp"), serverdata.source, serverdata.cdata)
-	editor = Compile(settings, Collect("src/editor/*.cpp"))
+	game_editor = Compile(settings, Collect("src/game/editor/*.cpp"))
 
 	if platform == "macosx" then
 		osxlaunch = Compile(settings, Collect("src/osxlaunch/*.m"))
@@ -280,7 +280,7 @@ function build(settings)
 	
 	-- build client, server and master server
 	client_exe = Link(client_settings, "teewars", game_shared, game_client,
-		engine, client, editor, glfw, portaudio, zlib, pnglite, wavpack,
+		engine, client, game_editor, glfw, portaudio, zlib, pnglite, wavpack,
 		client_link_other)
 
 	server_exe = Link(server_settings, "teewars_srv", engine, server,