Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 13 Jan 2016 16:08:22 -0800 |
| 4 | Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers |
| 5 | |
| 6 | bcm_host.h is in standard includedir in sysroot |
| 7 | add that to header search paths. |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | --- |
| 11 | Upstream-Status: Submitted |
| 12 | |
| 13 | wscript | 3 ++- |
| 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/wscript b/wscript |
| 17 | index fcbb55b..cece8bf 100644 |
| 18 | --- a/wscript |
| 19 | +++ b/wscript |
| 20 | @@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform): |
| 21 | conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') |
| 22 | import os |
| 23 | sysroot = conf.options.sysroot + conf.options.prefix |
| 24 | + std_include_path = os.path.join(sysroot, 'include') |
| 25 | vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') |
| 26 | vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') |
| 27 | - if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'): |
| 28 | + if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): |
| 29 | conf.fatal('Check if --prefix and --sysroot are set correctly.') |
| 30 | conf.env['WITH_APIS'] = [] |
| 31 | if check_gles2(conf): |
| 32 | -- |
| 33 | 2.7.0 |
| 34 | |