edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

added clang support

Browse source
This commit is contained in:
m!nus 2014-04-26 16:30:44 +02:00
parent 688c42f525
commit 71bce2c499
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
bam.lua
View file

@ -54,7 +54,7 @@ function ResCompile(scriptfile)
if config.compiler.driver == "cl" then if config.compiler.driver == "cl" then
output = PathJoin(generated_icon_dir, PathBase(PathFilename(scriptfile)) .. ".res") output = PathJoin(generated_icon_dir, PathBase(PathFilename(scriptfile)) .. ".res")
AddJob(output, "rc " .. scriptfile, "rc /fo " .. output .. " " .. scriptfile) AddJob(output, "rc " .. scriptfile, "rc /fo " .. output .. " " .. scriptfile)
elseif config.compiler.driver == "gcc" then elseif config.compiler.driver == "gcc" or config.compiler.driver == "clang" then
output = PathJoin(generated_icon_dir, PathBase(PathFilename(scriptfile)) .. ".coff") output = PathJoin(generated_icon_dir, PathBase(PathFilename(scriptfile)) .. ".coff")
AddJob(output, "windres " .. scriptfile, "windres -i " .. scriptfile .. " -o " .. output) AddJob(output, "windres " .. scriptfile, "windres -i " .. scriptfile .. " -o " .. output)
end end
@ -76,7 +76,7 @@ end
function GenerateCommonSettings(settings) function GenerateCommonSettings(settings)
if compiler == "gcc" then if compiler == "gcc" or compiler == "clang" then
settings.cc.flags:Add("-Wall", "-fno-exceptions") settings.cc.flags:Add("-Wall", "-fno-exceptions")
end end
@ -205,7 +205,7 @@ function GenerateWindowsSettings(settings, conf, target_arch, compiler)
os.exit(1) os.exit(1)
end end
settings.cc.flags:Add("/wd4244") settings.cc.flags:Add("/wd4244")
elseif compiler == "gcc" then elseif compiler == "gcc" or config.compiler.driver == "clang" then
if target_arch == "x86" then if target_arch == "x86" then
settings.cc.flags:Add("-m32") settings.cc.flags:Add("-m32")
settings.link.flags:Add("-m32") settings.link.flags:Add("-m32")
@ -359,6 +359,8 @@ function GenerateSettings(conf, arch, builddir, compiler)
-- Set compiler if explicitly requested -- Set compiler if explicitly requested
if compiler == "gcc" then if compiler == "gcc" then
SetDriversGCC(settings) SetDriversGCC(settings)
elseif compiler == "clang" then
SetDriversClang(settings)
elseif compiler == "cl" then elseif compiler == "cl" then
SetDriversCL(settings) SetDriversCL(settings)
else else