[Mesa-dev] [PATCH] osmesa: Add gallium include dirs

[Martin Peres]

On 23/02/15 17:51, Brian Paul wrote:
> On 02/23/2015 01:31 AM, Martin Peres wrote:
>> Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
>> ---
>>   src/mesa/drivers/osmesa/Makefile.am | 2 ++
>>   src/mesa/drivers/osmesa/SConscript  | 2 ++
>>   2 files changed, 4 insertions(+)
>>
>> diff --git a/src/mesa/drivers/osmesa/Makefile.am 
>> b/src/mesa/drivers/osmesa/Makefile.am
>> index 589b5ee..590dd66 100644
>> --- a/src/mesa/drivers/osmesa/Makefile.am
>> +++ b/src/mesa/drivers/osmesa/Makefile.am
>> @@ -29,6 +29,8 @@ AM_CPPFLAGS = \
>>       -I$(top_srcdir)/src/mapi \
>>       -I$(top_builddir)/src/mapi \
>>       -I$(top_srcdir)/src/mesa/ \
>> +    -I$(top_srcdir)/src/gallium/include \
>> +    -I$(top_srcdir)/src/gallium/auxiliary \
>>       $(DEFINES)
>>   AM_CFLAGS = $(PTHREAD_CFLAGS) \
>>       $(VISIBILITY_CFLAGS)
>> diff --git a/src/mesa/drivers/osmesa/SConscript 
>> b/src/mesa/drivers/osmesa/SConscript
>> index caa14d3..f836da5 100644
>> --- a/src/mesa/drivers/osmesa/SConscript
>> +++ b/src/mesa/drivers/osmesa/SConscript
>> @@ -6,6 +6,8 @@ env.Prepend(CPPPATH = [
>>       '#src',
>>       '#src/mapi',
>>       '#src/mesa',
>> +    '#src/gallium/include',
>> +    '#src/gallium/auxiliary',
>>       Dir('../../../mapi'), # src/mapi build path for 
>> python-generated GL API files/headers
>>   ])
>>
>>
>
> As with my patch for the xlib driver, I didn't have to change the 
> SConscript file.  osmesa was building fine as-is.  Did you test that?

I could not test it on windows (where it is mostly used, I presume) so I 
did not try.

>
> Anyway, the other part of the patch looks like what I posted.

Indeed.