mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 10:08:18 +00:00
Merge pull request #68 from cinaera/pr_compiler
Fix compiler settings for cl
This commit is contained in:
commit
749143c45a
5
bam.lua
5
bam.lua
|
@ -148,8 +148,6 @@ function build(settings)
|
|||
|
||||
--settings.cc.flags:Add("-m32")
|
||||
--settings.link.flags:Add("-m32")
|
||||
settings.link.flags:Add("-static-libgcc")
|
||||
settings.link.flags:Add("-static-libstdc++")
|
||||
|
||||
cflags = os.getenv("CFLAGS")
|
||||
if cflags then
|
||||
|
@ -162,7 +160,10 @@ function build(settings)
|
|||
|
||||
if config.compiler.driver == "cl" then
|
||||
settings.cc.flags:Add("/wd4244")
|
||||
settings.cc.flags:Add("/EHsc")
|
||||
else
|
||||
settings.link.flags:Add("-static-libgcc")
|
||||
settings.link.flags:Add("-static-libstdc++")
|
||||
settings.cc.flags:Add("-Wall")
|
||||
if family == "windows" then
|
||||
-- disable visibility attribute support for gcc on windows
|
||||
|
|
Loading…
Reference in a new issue