diff options
| author | Nicolai Hähnle <[email protected]> | 2017-06-30 11:57:06 +0200 |
|---|---|---|
| committer | Nicolai Hähnle <[email protected]> | 2017-07-31 15:38:41 +0200 |
| commit | 601093f95ddf6b49a79baa91dc51d4f163dfc8de (patch) | |
| tree | 79cc7388e4d4de45d226852368ffcc813098b577 /src/gallium | |
| parent | 1e40d2c8820e2045fbfed387a93a486c8b1c94fd (diff) | |
xmlconfig: move into src/util
v2: attempt to fix Android build (Emil)
v3: add missing include path
Reviewed-by: Marek Olšák <[email protected]> (v1)
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/dri/Makefile.am | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.c | 2 | ||||
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.h | 2 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gallium/targets/d3dadapter9/drm.c | 4 |
5 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index 61a1cabeb81..8b427f98aca 100644 --- a/src/gallium/state_trackers/dri/Makefile.am +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -28,7 +28,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mesa \ - -I$(top_builddir)/src/mesa/drivers/dri/common \ + -I$(top_builddir)/src/util \ -I$(top_srcdir)/src/mesa/drivers/dri/common \ $(GALLIUM_CFLAGS) \ $(LIBDRM_CFLAGS) \ diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c index 890a8bff4c6..43e67b6555f 100644 --- a/src/gallium/state_trackers/dri/dri_screen.c +++ b/src/gallium/state_trackers/dri/dri_screen.c @@ -30,7 +30,7 @@ */ #include "utils.h" -#include "xmlpool.h" +#include "util/xmlpool.h" #include "dri_screen.h" #include "dri_context.h" diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h index 550bc510cec..383e762393e 100644 --- a/src/gallium/state_trackers/dri/dri_screen.h +++ b/src/gallium/state_trackers/dri/dri_screen.h @@ -33,7 +33,7 @@ #define DRI_SCREEN_H #include "dri_util.h" -#include "xmlconfig.h" +#include "util/xmlconfig.h" #include "pipe/p_compiler.h" #include "pipe/p_context.h" diff --git a/src/gallium/targets/d3dadapter9/Makefile.am b/src/gallium/targets/d3dadapter9/Makefile.am index 8f2a6f5601e..824e8d6b932 100644 --- a/src/gallium/targets/d3dadapter9/Makefile.am +++ b/src/gallium/targets/d3dadapter9/Makefile.am @@ -27,7 +27,6 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/loader \ -I$(top_srcdir)/src/mapi/ \ -I$(top_srcdir)/src/mesa/ \ - -I$(top_builddir)/src/mesa/drivers/dri/common/ \ -I$(top_srcdir)/src/mesa/drivers/dri/common/ \ -I$(top_srcdir)/src/gallium/winsys \ -I$(top_srcdir)/src/gallium/state_trackers/nine \ diff --git a/src/gallium/targets/d3dadapter9/drm.c b/src/gallium/targets/d3dadapter9/drm.c index 27c3fb16751..c0ed97a6fb5 100644 --- a/src/gallium/targets/d3dadapter9/drm.c +++ b/src/gallium/targets/d3dadapter9/drm.c @@ -37,8 +37,8 @@ #include "d3dadapter/d3dadapter9.h" #include "d3dadapter/drm.h" -#include "xmlconfig.h" -#include "xmlpool.h" +#include "util/xmlconfig.h" +#include "util/xmlpool.h" #include <drm.h> #include <sys/ioctl.h> |