egl/dri2: Fix include path of u_atomic.h introduced e7e29189

This was causing a failure to build on SCons due to a missing
-Isrc/egl. Instead of adding in that path, lets just -Isrc/
and include "utils/u_atomic.h".

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index be7bfe9c3ab206b4aebef35fb9f020af46d19b2f..5c2ba301ffb349f21dcd564e50a14aebe9b24ff5 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -25,6 +25,7 @@ AM_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/egl/main \
        -I$(top_srcdir)/src/gbm/main \
+       -I$(top_srcdir)/src \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS) \
        $(LIBDRM_CFLAGS) \

diff --git a/src/egl/SConscript b/src/egl/SConscript
index a7f62824e14fb97349ffc1355de55b60ddd1258b..1b2a4271ef73f94be548efb2db55a616b647d6d8 100644 (file)
--- a/src/egl/SConscript
+++ b/src/egl/SConscript
@@ -9,6 +9,7 @@ env = env.Clone()
 env.Append(CPPPATH = [
     '#/include',
     '#/src/egl/main',
+    '#/src',
 ])
 
 

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 0290c077ef60cd7c5296d93f06ad59520ace5156..461735fe9e37cc0d6b685d8d44e5f01895df4a35 100644 (file)
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -52,7 +52,7 @@
 #endif
 
 #include "egl_dri2.h"
-#include "../util/u_atomic.h"
+#include "util/u_atomic.h"
 
 /* The kernel header drm_fourcc.h defines the DRM formats below.  We duplicate
  * some of the definitions here so that building Mesa won't bleeding-edge