diff options
| author | 2016-01-04 15:29:19 +0100 | |
|---|---|---|
| committer | 2016-01-04 15:31:32 +0100 | |
| commit | 8172839141a34e580295fe3611c580c0379b3704 (patch) | |
| tree | e8059c9a66530387e381beed90192071fb608804 /scripts | |
| parent | bf82e1e55cfe4465c6ef934e3c34206983cc76f7 (diff) | |
Some cleanup in build scripts, GNU C99 for 3rdparty C files (nw)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/genie.lua | 25 | ||||
| -rw-r--r-- | scripts/src/3rdparty.lua | 5 | ||||
| -rw-r--r-- | scripts/toolchain.lua | 2 |
3 files changed, 5 insertions, 27 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index d4caa547904..cccd66266fd 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -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,30 +1053,20 @@ configuration { "osx*" } "pthread", } -configuration { "mingw-clang" } - links { - "gcc", - "stdc++", - "user32", - "winmm", - "advapi32", - "shlwapi", - "wsock32", - "pthread", - } - -configuration { "mingw*-gcc" } +configuration { "mingw*" } linkoptions { "-static-libgcc", "-static-libstdc++", "-static", } links { + "stdc++", "user32", "winmm", "advapi32", "shlwapi", "wsock32", + "pthread", } configuration { "vs*" } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index da3740bd28d..f87f0bc43fb 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -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 diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 5d3646b48ea..9c8b78ee485 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -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", } |
