diff options
| author | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:02:03 +0100 |
|---|---|---|
| committer | Anton Kindestam <antonki@kth.se> | 2018-12-05 19:19:24 +0100 |
| commit | 8b83c8996686072bc743b112ae5cb3bf93aa33ed (patch) | |
| tree | b09ce6a7ff470b05006622f19914b3d39d2f7d9f /waftools | |
| parent | 5bcac8580df6fc62323136f756a3a6d1e754fe9c (diff) | |
| parent | 559a400ac36e75a8d73ba263fd7fa6736df1c2da (diff) | |
| download | mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.bz2 mpv-8b83c8996686072bc743b112ae5cb3bf93aa33ed.tar.xz | |
Merge commit '559a400ac36e75a8d73ba263fd7fa6736df1c2da' into wm4-commits--merge-edition
This bumps libmpv version to 1.103
Diffstat (limited to 'waftools')
| -rw-r--r-- | waftools/detections/compiler.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py index 1befec5db5..55fa6d7b16 100644 --- a/waftools/detections/compiler.py +++ b/waftools/detections/compiler.py @@ -20,7 +20,12 @@ def __add_generic_flags__(ctx): ctx.env.CFLAGS += ["-D_ISOC99_SOURCE", "-D_GNU_SOURCE", "-D_LARGEFILE_SOURCE", "-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE64_SOURCE", - "-std=c99", "-Wall"] + "-Wall"] + + if ctx.check_cc(cflags="-std=c11", mandatory=False): + ctx.env.CFLAGS += ["-std=c11"] + else: + ctx.env.CFLAGS += ["-std=c99"] if ctx.is_optimization(): ctx.env.CFLAGS += ['-O2'] |