projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
egl: move eglQueryContext() fallback to eglapi.c
[mesa.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index a0c965efc32bcd43ea4115144f888990fcbdb80f..31bb0dd04eabd54da54df6544bcdb51305fe8031 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-278,6
+278,10
@@
with_platform_surfaceless = _platforms.contains('surfaceless')
with_platforms = false
if _platforms.length() != 0 and _platforms != ['']
with_platforms = false
if _platforms.length() != 0 and _platforms != ['']
+ # sanity check that list contains no empty strings
+ if _platforms.contains('')
+ error('Invalid argument list given to -Dplatforms, please fix.')
+ endif
with_platforms = true
egl_native_platform = _platforms[0]
endif
with_platforms = true
egl_native_platform = _platforms[0]
endif
@@
-353,12
+357,12
@@
else
with_egl = false
endif
with_egl = false
endif
-if with_egl and not (with_platform_drm or with_platform_surfaceless)
+if with_egl and not (with_platform_drm or with_platform_surfaceless
or with_platform_android
)
if with_gallium_radeonsi
if with_gallium_radeonsi
- error('RadeonSI requires
drm or surfaceless
platform when using EGL')
+ error('RadeonSI requires
the drm, surfaceless or android
platform when using EGL')
endif
if with_gallium_virgl
endif
if with_gallium_virgl
- error('Virgl requires
drm or surfaceless
platform when using EGL')
+ error('Virgl requires
the drm, surfaceless or android
platform when using EGL')
endif
endif
endif
endif
@@
-1036,7
+1040,7
@@
elif cc.has_header_symbol('sys/mkdev.h', 'major')
pre_args += '-DMAJOR_IN_MKDEV'
endif
pre_args += '-DMAJOR_IN_MKDEV'
endif
-foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h']
+foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h'
, 'sys/shm.h'
]
if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif
if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif