Module: Mesa
Branch: master
Commit: ba651967a201b48f380cd30495e271317c1d8522
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba651967a201b48f380cd30495e271317c1d8522
Author: Alexander von Gluck IV <kallis...@unixzen.com>
Date: Fri Aug 7 12:55:40 2015 -0500
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 <matts...@gmail.com>
---
src/egl/Makefile.am | 1 +
src/egl/SConscript | 1 +
src/egl/drivers/dri2/egl_dri2.c | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index be7bfe9..5c2ba30 100644
--- 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 a7f6282..1b2a427 100644
--- 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 0290c07..461735f 100644
--- 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
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
