diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2022-12-26 12:03:11 -0500 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2023-03-12 17:56:10 -0400 |
| commit | ef0e327d9fbd0b7a851b53afecede3e518d38c2c (patch) | |
| tree | 0fdf93d908f969501cd69d8bd7b37161c616d2c8 /src/mapi | |
| parent | eed145004be25775d24cecffad4bb451ce31496a (diff) | |
| download | mesa-ef0e327d9fbd0b7a851b53afecede3e518d38c2c.tar.gz | |
glapi: inline the meson list files_mapi_util
so that people can easily tell where these files are used by searching
for the file names in the meson files.
Acked-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21777>
Diffstat (limited to 'src/mapi')
| -rw-r--r-- | src/mapi/glapi/meson.build | 5 | ||||
| -rw-r--r-- | src/mapi/meson.build | 7 | ||||
| -rw-r--r-- | src/mapi/shared-glapi/meson.build | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/mapi/glapi/meson.build b/src/mapi/glapi/meson.build index 516a2b0d74e..7305e85b808 100644 --- a/src/mapi/glapi/meson.build +++ b/src/mapi/glapi/meson.build @@ -55,6 +55,10 @@ if with_platform_windows static_glapi_args += ['-D_GDI32_', '-DKHRONOS_DLL_EXPORTS', '-D_GLAPI_DLL_EXPORTS'] endif static_glapi_files += files( + '../u_current.c', + '../u_current.h', + '../u_execmem.c', + '../u_execmem.h', 'glapi_dispatch.c', 'glapi_entrypoint.c', 'glapi_getproc.c', @@ -63,7 +67,6 @@ static_glapi_files += files( 'glapi.h', 'glapi_priv.h', ) -static_glapi_files += files_mapi_util static_glapi_files += [ glapitable_h, glapi_mapi_tmp_h, glprocs_h, glapitemp_h, ] diff --git a/src/mapi/meson.build b/src/mapi/meson.build index 2c79a04f1df..71331aaa631 100644 --- a/src/mapi/meson.build +++ b/src/mapi/meson.build @@ -18,13 +18,6 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -files_mapi_util = files( - 'u_current.c', - 'u_current.h', - 'u_execmem.c', - 'u_execmem.h', -) - genCommon_py = files('new/genCommon.py') glapi_gen_mapi_py = files('new/gen_gldispatch_mapi.py') mapi_abi_py = files('mapi_abi.py') diff --git a/src/mapi/shared-glapi/meson.build b/src/mapi/shared-glapi/meson.build index 94cb727e4a3..bf84745d19d 100644 --- a/src/mapi/shared-glapi/meson.build +++ b/src/mapi/shared-glapi/meson.build @@ -20,6 +20,10 @@ files_shared_glapi = files( '../entry.c', + '../u_current.c', + '../u_current.h', + '../u_execmem.c', + '../u_execmem.h', 'glapi.c', 'stub.c', 'stub.h', @@ -43,7 +47,7 @@ endif libglapi = shared_library( 'glapi', - [files_shared_glapi, files_mapi_util, shared_glapi_mapi_tmp_h], + [files_shared_glapi, shared_glapi_mapi_tmp_h], c_args : [ _glapi_c_args, c_msvc_compat_args, |