Merge branch 'X11Libre:master' into master
This commit is contained in:
commit
1811c4e24f
|
@ -777,7 +777,8 @@ endif
|
||||||
|
|
||||||
subdir('hw')
|
subdir('hw')
|
||||||
|
|
||||||
if host_machine.system() != 'windows'
|
build_tests = get_option('tests') and host_machine.system() != 'windows'
|
||||||
|
if build_tests
|
||||||
subdir('test')
|
subdir('test')
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -110,6 +110,8 @@ option('sha1', type: 'combo', choices: ['libc', 'CommonCrypto', 'CryptoAPI', 'li
|
||||||
description: 'SHA1 implementation')
|
description: 'SHA1 implementation')
|
||||||
option('xf86-input-inputtest', type: 'boolean', value: true,
|
option('xf86-input-inputtest', type: 'boolean', value: true,
|
||||||
description: 'Test input driver support on Xorg')
|
description: 'Test input driver support on Xorg')
|
||||||
|
option('tests', type: 'boolean', value: true,
|
||||||
|
description: 'Build tests for the X server on platforms that support it')
|
||||||
|
|
||||||
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
|
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
|
||||||
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
|
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
|
||||||
|
|
Loading…
Reference in New Issue