diff options
| author | Dylan Baker <[email protected]> | 2017-12-11 15:56:08 -0800 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2018-01-11 15:40:02 -0800 |
| commit | fbf192a67ed2e3d4f614b49fe008c980c5f7c9a2 (patch) | |
| tree | d0320f703e9b2ffc4096720db4784cf10ea882ef /src/mapi | |
| parent | c3d802d68e222bf4030ab4e487501dfbcb34608d (diff) | |
meson: Use consistent style
Currently the meosn build has a mix of two styles:
arg : [foo, ...
bar],
and
arg : [
foo, ...,
bar,
]
For consistency let's pick one. I've picked the later style, which I
think is more readable, and is more common in the mesa code base.
v2: - fix commit message
Acked-by: Eric Engestrom <[email protected]>
Signed-off-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/es1api/meson.build | 6 | ||||
| -rw-r--r-- | src/mapi/es2api/meson.build | 6 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/meson.build | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build index 36adde4c48c..53851da306b 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mapi/es1api/meson.build @@ -30,8 +30,10 @@ es1_glapi_mapi_tmp_h = custom_target( libglesv1_cm = shared_library( 'GLESv1_CM', ['../entry.c', es1_glapi_mapi_tmp_h], - c_args : [c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE', - '-DMAPI_ABI_HEADER="@0@"'.format(es1_glapi_mapi_tmp_h.full_path())], + c_args : [ + c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE', + '-DMAPI_ABI_HEADER="@0@"'.format(es1_glapi_mapi_tmp_h.full_path()), + ], link_args : [ld_args_gc_sections], include_directories : [inc_src, inc_include, inc_mapi], link_with : libglapi, diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build index be5b8ab204f..8751107cb71 100644 --- a/src/mapi/es2api/meson.build +++ b/src/mapi/es2api/meson.build @@ -30,8 +30,10 @@ es2_glapi_mapi_tmp_h = custom_target( libgles2 = shared_library( 'GLESv2', ['../entry.c', es2_glapi_mapi_tmp_h], - c_args : [c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE', - '-DMAPI_ABI_HEADER="@0@"'.format(es2_glapi_mapi_tmp_h.full_path())], + c_args : [ + c_msvc_compat_args, c_vis_args, '-DMAPI_MODE_BRIDGE', + '-DMAPI_ABI_HEADER="@0@"'.format(es2_glapi_mapi_tmp_h.full_path()), + ], link_args : [ld_args_gc_sections], include_directories : [inc_src, inc_include, inc_mapi], link_with : libglapi, diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index eca2bd29439..fe0d458d934 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -39,8 +39,10 @@ shared_glapi_mapi_tmp_h = custom_target( libglapi = shared_library( 'glapi', [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h], - c_args : [c_msvc_compat_args, '-DMAPI_MODE_GLAPI', - '-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path())], + c_args : [ + c_msvc_compat_args, '-DMAPI_MODE_GLAPI', + '-DMAPI_ABI_HEADER="@0@"'.format(shared_glapi_mapi_tmp_h.full_path()), + ], link_args : [ld_args_gc_sections], include_directories : [inc_src, inc_include, inc_mapi], dependencies : [dep_thread, dep_selinux], |