From 64d55a22ee74f06738715858d2f88988b046ead0 Mon Sep 17 00:00:00 2001 From: Johan Althoff Date: Fri, 13 Jul 2007 21:20:57 +0000 Subject: [PATCH] fixed compile stuff for windows --- default.bam | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/default.bam b/default.bam index 956dbbafc..bc8206a2f 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")