mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

glcpp: remove outdated msvc hack 

While MSVC doesn't do __STDC_VERSION__ correctly for C99, it does for
C11, which is what we now require. So we can remove this hack.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16908>
This commit is contained in:
Erik Faye-Lund 2022-06-07 16:46:20 +02:00 committed by Marge Bot
parent 3a62badb2e
commit ec9d7872ac
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/glsl/glcpp/meson.build
View File

@ -45,23 +45,13 @@ 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_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_msvc_compat_args, _extra_args],
c_args : [no_override_init_args, c_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false,
)
@ -72,8 +62,8 @@ libglcpp_standalone = static_library(
link_with : libglcpp,
dependencies : idep_mesautil,
include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
c_args : [no_override_init_args, c_msvc_compat_args, _extra_args],
cpp_args : [cpp_msvc_compat_args, _extra_args],
c_args : [no_override_init_args, c_msvc_compat_args],
cpp_args : [cpp_msvc_compat_args],
gnu_symbol_visibility : 'hidden',
build_by_default : false,
)