projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl: drop unused _EGL_BUILT_IN_DRIVER_DRI2
[mesa.git]
/
src
/
egl
/
meson.build
diff --git
a/src/egl/meson.build
b/src/egl/meson.build
index 6537e4bdee61a49e5ae855c18584d472567553ee..e11e589b94561657746676ae645f3019e8a1efba 100644
(file)
--- a/
src/egl/meson.build
+++ b/
src/egl/meson.build
@@
-24,7
+24,7
@@
inc_egl_dri2 = include_directories('drivers/dri2')
c_args_for_egl = []
link_for_egl = []
deps_for_egl = []
c_args_for_egl = []
link_for_egl = []
deps_for_egl = []
-incs_for_egl = [inc_include, inc_src, inc_egl]
+incs_for_egl = [inc_include, inc_
drm_uapi, inc_
src, inc_egl]
files_egl = files(
'main/eglapi.c',
files_egl = files(
'main/eglapi.c',
@@
-65,7
+65,7
@@
g_egldispatchstubs_c = custom_target(
],
output : 'g_egldispatchstubs.c',
command : [
],
output : 'g_egldispatchstubs.c',
command : [
- prog_python
2
, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@'
+ prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@'
],
depend_files : files('generate/genCommon.py'),
capture : true,
],
depend_files : files('generate/genCommon.py'),
capture : true,
@@
-79,7
+79,7
@@
g_egldispatchstubs_h = custom_target(
],
output : 'g_egldispatchstubs.h',
command : [
],
output : 'g_egldispatchstubs.h',
command : [
- prog_python
2
, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@'
+ prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@'
],
depend_files : files('generate/genCommon.py'),
capture : true,
],
depend_files : files('generate/genCommon.py'),
capture : true,
@@
-93,12
+93,12
@@
if with_dri2
)
c_args_for_egl += [
'-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
)
c_args_for_egl += [
'-DDEFAULT_DRIVER_DIR="@0@"'.format(dri_search_path),
- '-D_EGL_BUILT_IN_DRIVER_DRI2',
]
endif
if with_platform_x11
files_egl += files('drivers/dri2/platform_x11.c')
]
endif
if with_platform_x11
files_egl += files('drivers/dri2/platform_x11.c')
+ incs_for_egl += inc_loader
if with_dri3
files_egl += files('drivers/dri2/platform_x11_dri3.c')
link_for_egl += libloader_dri3_helper
if with_dri3
files_egl += files('drivers/dri2/platform_x11_dri3.c')
link_for_egl += libloader_dri3_helper
@@
-113,9
+113,10
@@
if with_platform_drm
endif
if with_platform_surfaceless
files_egl += files('drivers/dri2/platform_surfaceless.c')
endif
if with_platform_surfaceless
files_egl += files('drivers/dri2/platform_surfaceless.c')
+ incs_for_egl += [inc_loader]
endif
if with_platform_wayland
endif
if with_platform_wayland
- deps_for_egl += [dep_wayland_client, dep_wayland_server]
+ deps_for_egl += [dep_wayland_client, dep_wayland_server
, dep_wayland_egl_headers
]
link_for_egl += libwayland_drm
files_egl += files('drivers/dri2/platform_wayland.c')
files_egl += [
link_for_egl += libwayland_drm
files_egl += files('drivers/dri2/platform_wayland.c')
files_egl += [
@@
-123,13
+124,12
@@
if with_platform_wayland
linux_dmabuf_unstable_v1_client_protocol_h,
wayland_drm_client_protocol_h,
]
linux_dmabuf_unstable_v1_client_protocol_h,
wayland_drm_client_protocol_h,
]
- incs_for_egl += include_directories(
- 'wayland/wayland-egl', 'wayland/wayland-drm',
- )
+ incs_for_egl += include_directories('wayland/wayland-drm')
endif
if with_platform_android
deps_for_egl += dep_android
files_egl += files('drivers/dri2/platform_android.c')
endif
if with_platform_android
deps_for_egl += dep_android
files_egl += files('drivers/dri2/platform_android.c')
+ incs_for_egl += [inc_loader]
endif
if with_platform_haiku
incs_for_egl += inc_haikugl
endif
if with_platform_haiku
incs_for_egl += inc_haikugl
@@
-141,8
+141,6
@@
if with_platform_haiku
deps_for_egl += cpp.find_library('be')
endif
deps_for_egl += cpp.find_library('be')
endif
-# TODO: glvnd
-
if cc.has_function('mincore')
c_args_for_egl += '-DHAVE_MINCORE'
endif
if cc.has_function('mincore')
c_args_for_egl += '-DHAVE_MINCORE'
endif
@@
-197,10
+195,6
@@
pkg.generate(
extra_cflags : gl_pkgconfig_c_flags,
)
extra_cflags : gl_pkgconfig_c_flags,
)
-if with_platform_wayland
- subdir('wayland/wayland-egl')
-endif
-
if with_tests
if with_glvnd
# TODO: add glvnd symbol check
if with_tests
if with_glvnd
# TODO: add glvnd symbol check