projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radv: remove descriptor_indexing fails from expected fails
[mesa.git]
/
meson.build
diff --git
a/meson.build
b/meson.build
index 9bf889659a335792aa71b1e973d3df883b0fa36b..be007953c8b8597491e792219d070f9ef96bc091 100644
(file)
--- a/
meson.build
+++ b/
meson.build
@@
-427,8
+427,10
@@
else
endif
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
endif
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
-if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+use_elf_tls = false
+if not ['windows', 'freebsd', 'openbsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29)
pre_args += '-DUSE_ELF_TLS'
pre_args += '-DUSE_ELF_TLS'
+ use_elf_tls = true
endif
if with_glx != 'disabled'
endif
if with_glx != 'disabled'
@@
-932,7
+934,7
@@
elif host_machine.system() == 'sunos'
pre_args += '-D__EXTENSIONS__'
elif host_machine.system() == 'windows'
pre_args += [
pre_args += '-D__EXTENSIONS__'
elif host_machine.system() == 'windows'
pre_args += [
- '-D_WINDOWS', '-D_WIN32_WINNT=0x0
601', '-DWINVER=0x0601
',
+ '-D_WINDOWS', '-D_WIN32_WINNT=0x0
A00', '-DWINVER=0x0A00
',
'-DPIPE_SUBSYSTEM_WINDOWS_USER',
'-D_USE_MATH_DEFINES', # XXX: scons doesn't use this for mingw
]
'-DPIPE_SUBSYSTEM_WINDOWS_USER',
'-D_USE_MATH_DEFINES', # XXX: scons doesn't use this for mingw
]
@@
-949,6
+951,8
@@
elif host_machine.system() == 'windows'
else
pre_args += ['-D__MSVCRT_VERSION__=0x0700']
endif
else
pre_args += ['-D__MSVCRT_VERSION__=0x0700']
endif
+elif host_machine.system() == 'openbsd'
+ pre_args += '-D_ISOC11_SOURCE'
endif
# Check for generic C arguments
endif
# Check for generic C arguments
@@
-1202,7
+1206,7
@@
if not ['linux'].contains(host_machine.system())
endif
endif
endif
endif
-foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h']
+foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'execinfo.h', 'sys/shm.h', 'cet.h'
, 'pthread_np.h'
]
if cc.check_header(h)
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif
if cc.check_header(h)
pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
endif
@@
-1784,10
+1788,10
@@
endif
_sensors = get_option('lmsensors')
if _sensors == 'true'
_sensors = 'enabled'
_sensors = get_option('lmsensors')
if _sensors == 'true'
_sensors = 'enabled'
- warning('sensors option "true" deprecated, please use "enabled" instead.')
+ warning('
lm
sensors option "true" deprecated, please use "enabled" instead.')
elif _sensors == 'false'
_sensors = 'disabled'
elif _sensors == 'false'
_sensors = 'disabled'
- warning('sensors option "false" deprecated, please use "disabled" instead.')
+ warning('
lm
sensors option "false" deprecated, please use "disabled" instead.')
endif
if _sensors != 'disabled'
dep_lmsensors = cc.find_library('sensors', required : _sensors == 'enabled')
endif
if _sensors != 'disabled'
dep_lmsensors = cc.find_library('sensors', required : _sensors == 'enabled')
@@
-1849,6
+1853,12
@@
if dep_dl.found()
gl_priv_libs += '-ldl'
endif
gl_priv_libs += '-ldl'
endif
+# FIXME: autotools lists this as incomplete
+gbm_priv_libs = []
+if dep_dl.found()
+ gbm_priv_libs += '-ldl'
+endif
+
pkg = import('pkgconfig')
if host_machine.system() == 'windows'
pkg = import('pkgconfig')
if host_machine.system() == 'windows'