fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-13 09:10:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

meson: force inclusion of inttypes.h for glcpp with msvc

Browse source 
Because we provide a copy if MSVC doesn't, and we need it to make flex
do what we want.

Acked-by: Kristian H. Kristensen <hoegsberg@google.com>
This commit is contained in:
Dylan Baker 2018-05-23 10:05:20 -07:00
parent 8b19c5b145
commit 150aec5d1f
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/compiler/glsl/glcpp/meson.build
View file

@ -35,13 +35,23 @@ glcpp_lex = custom_target(
command : [prog_flex, '-o', '@OUTPUT@', '@INPUT@'],
)
_extra_args = []
if cpp.get_id() == 'msvc'
# Flex relies on __STDC_VERSION__>=199901L to decide when to include C99
# inttypes.h. We always have inttypes.h available with MSVC (either the one
# bundled with MSVC 2013, or the one we bundle ourselves), but we can't just
# define __STDC_VERSION__ without breaking stuff, as MSVC doesn't fully
# support C99. There's also no way to premptively include stdint.
_extra_args += '-FIinttypes.h'
endif
libglcpp = static_library(
'glcpp',
[glcpp_lex, glcpp_parse, files('glcpp.h', 'pp.c')],
dependencies : idep_mesautil,
include_directories : [inc_common],
c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args],
c_args : [c_vis_args, no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_vis_args, cpp_msvc_compat_args, _extra_args],
build_by_default : false,
)