mirror of
https://github.com/holub/mame
synced 2025-04-19 23:12:11 +03:00
Some cleanup in build scripts, GNU C99 for 3rdparty C files (nw)
This commit is contained in:
parent
bf82e1e55c
commit
8172839141
@ -675,16 +675,11 @@ end
|
||||
|
||||
if _ACTION == "gmake" then
|
||||
|
||||
--we compile C-only to C89 standard with GNU extensions
|
||||
if (_OPTIONS["targetos"]=="solaris") then
|
||||
--we compile C-only to C99 standard with GNU extensions
|
||||
|
||||
buildoptions_c {
|
||||
"-std=gnu99",
|
||||
}
|
||||
else
|
||||
buildoptions_c {
|
||||
"-std=gnu89",
|
||||
}
|
||||
end
|
||||
|
||||
local version = str_to_version(_OPTIONS["gcc_version"])
|
||||
if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then
|
||||
@ -1058,9 +1053,13 @@ configuration { "osx*" }
|
||||
"pthread",
|
||||
}
|
||||
|
||||
configuration { "mingw-clang" }
|
||||
configuration { "mingw*" }
|
||||
linkoptions {
|
||||
"-static-libgcc",
|
||||
"-static-libstdc++",
|
||||
"-static",
|
||||
}
|
||||
links {
|
||||
"gcc",
|
||||
"stdc++",
|
||||
"user32",
|
||||
"winmm",
|
||||
@ -1070,20 +1069,6 @@ configuration { "mingw-clang" }
|
||||
"pthread",
|
||||
}
|
||||
|
||||
configuration { "mingw*-gcc" }
|
||||
linkoptions {
|
||||
"-static-libgcc",
|
||||
"-static-libstdc++",
|
||||
"-static",
|
||||
}
|
||||
links {
|
||||
"user32",
|
||||
"winmm",
|
||||
"advapi32",
|
||||
"shlwapi",
|
||||
"wsock32",
|
||||
}
|
||||
|
||||
configuration { "vs*" }
|
||||
defines {
|
||||
"XML_STATIC",
|
||||
|
@ -385,11 +385,6 @@ project "lua"
|
||||
"-Wno-bad-function-cast"
|
||||
}
|
||||
|
||||
configuration { "mingw-clang" }
|
||||
defines {
|
||||
"LUA_USE_C89",
|
||||
}
|
||||
|
||||
configuration { "vs*" }
|
||||
buildoptions {
|
||||
"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
|
||||
|
@ -485,8 +485,6 @@ function toolchain(_buildDir, _subDir)
|
||||
|
||||
configuration { "mingw-clang" }
|
||||
linkoptions {
|
||||
"-Qunused-arguments",
|
||||
"-Wno-error=unused-command-line-argument-hard-error-in-future",
|
||||
"-Wl,--allow-multiple-definition",
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user