about summary refs log tree commit diff
path: root/default.bam
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-09-09 18:21:14 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-09-09 18:21:14 +0000
commit3f4587ede831760b2f6976960658d202c9d847ff (patch)
tree6c3a22251906673e5e7491dcd86faec23887691b /default.bam
parent350e968f514a00d4a89395ed13e415103390b9d9 (diff)
downloadzcatch-3f4587ede831760b2f6976960658d202c9d847ff.tar.gz
zcatch-3f4587ede831760b2f6976960658d202c9d847ff.zip
a lot of changes. client side prediction added
Diffstat (limited to 'default.bam')
-rw-r--r--default.bam6
1 files changed, 3 insertions, 3 deletions
diff --git a/default.bam b/default.bam
index 537edaf6..3eb185b8 100644
--- a/default.bam
+++ b/default.bam
@@ -201,7 +201,7 @@ function build(settings)
 	engine_settings = settings:copy()
 	
 	if family == "windows" then
-		engine_settings.cc.flags = "/wd4244 /TP"
+		engine_settings.cc.flags = "/wd4244"
 	else
 		engine_settings.cc.flags = "-Wall"
 		engine_settings.linker.flags = ""
@@ -231,12 +231,12 @@ function build(settings)
 	objs = Compile(settings, tools_src)
 	tools = {}
 	for i,v in objs do
-		toolname = PathFilename(file_base(v))
+		toolname = PathFilename(PathBase(v))
 		tools[i] = Link(settings, toolname, v, engine)
 	end
 	
 	-- build client, server and master server
-	client_exe = Link(settings, "teewars", game_shared, game_client, engine, client, editor, glfw, pa, client_link_other)
+	client_exe = Link(settings, "teewars", game_shared, game_client, engine, client, editor, glfw, pa, client_libs, client_link_other)
 	server_exe = Link(server_settings, "teewars_srv", engine, server, game_shared, game_server)
 	masterserver_exe = Link(server_settings, "mastersrv", masterserver, engine)