about summary refs log tree commit diff
path: root/default.bam
diff options
context:
space:
mode:
authorJohan Althoff <teetow@gmail.com>2007-07-13 21:20:57 +0000
committerJohan Althoff <teetow@gmail.com>2007-07-13 21:20:57 +0000
commit64d55a22ee74f06738715858d2f88988b046ead0 (patch)
tree4d8776b93a2abe57d49a9095d09218f975d74a55 /default.bam
parent7946d6ac5020e99a3c49de33b896b9456b30177f (diff)
downloadzcatch-64d55a22ee74f06738715858d2f88988b046ead0.tar.gz
zcatch-64d55a22ee74f06738715858d2f88988b046ead0.zip
fixed compile stuff for windows
Diffstat (limited to 'default.bam')
-rw-r--r--default.bam17
1 files changed, 13 insertions, 4 deletions
diff --git a/default.bam b/default.bam
index 956dbbaf..bc8206a2 100644
--- a/default.bam
+++ b/default.bam
@@ -31,19 +31,24 @@ function Copy(outputdir, ...)
 	return outputs
 end
 
+dc_compiler = "scripts/compiler.py"
+if family == "windows" then
+	dc_compiler = "scripts\\compiler.py"
+end
+
 function dc_header(output, data, script)
 	print("dc_header " .. PathFilename(output) .. " = " .. PathFilename(data) .. " ~ " .. PathFilename(script))
-    return os.execute("scripts/compiler.py " .. data .. " " .. script .. " -h " .. output)
+	return os.execute(dc_compiler .. " " .. data .. " " .. script .. " -h " .. output)
 end
 
 function dc_source(output, data, script)
 	print("dc_source " .. PathFilename(output) .. " = " .. PathFilename(data) .. " ~ " .. PathFilename(script))
-    return os.execute("scripts/compiler.py " .. data .. " " .. script .. " -s " .. output)
+	return os.execute(dc_compiler .. " " .. data .. " " .. script .. " -s " .. output)
 end
 
 function dc_data(output, data, script)
 	print("dc_data " .. PathFilename(output) .. " = " .. PathFilename(data) .. " ~ " .. PathFilename(script))
-    return os.execute("scripts/compiler.py " .. data .. " " .. script .. " -d " .. output)
+	return os.execute(dc_compiler .. " " .. data .. " " .. script .. " -d " .. output)
 end
 
 
@@ -96,7 +101,11 @@ baselib.apply(server_settings, "network")
 
 settings.cc.debug = 1
 settings.cc.optimize = 0
-settings.cc.flags = "-Wall"
+if family == "windows" then
+	settings.cc.flags = "/wd4244"
+else
+	settings.cc.flags = "-Wall"
+end
 settings.cc.includes:add("src")
 settings.cc.includes:add("../baselib/src/external/zlib")