From 57cf5946ce7604aa42c78dbdc34c453f8b2a0b21 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Thu, 18 Jul 2013 23:05:13 +1000 Subject: [PATCH] radeonsi: Make sure libdrm_radeon headers are picked up from the right place And remove libdrm/ from a winsys include statement. Signed-off-by: Jonathan Gray --- src/gallium/drivers/radeonsi/Makefile.am | 3 ++- src/gallium/winsys/radeon/drm/radeon_winsys.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/radeonsi/Makefile.am b/src/gallium/drivers/radeonsi/Makefile.am index 46aa998..0c27973 100644 --- a/src/gallium/drivers/radeonsi/Makefile.am +++ b/src/gallium/drivers/radeonsi/Makefile.am @@ -29,7 +29,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/gallium/drivers/radeon \ -I$(top_srcdir)/src/gallium/drivers \ -I$(top_srcdir)/include \ - $(GALLIUM_CFLAGS) + $(GALLIUM_CFLAGS) \ + $(RADEON_CFLAGS) AM_CFLAGS = $(LLVM_CFLAGS) libradeonsi_la_SOURCES = $(C_SOURCES) diff --git a/src/gallium/winsys/radeon/drm/radeon_winsys.h b/src/gallium/winsys/radeon/drm/radeon_winsys.h index 9c6589a..1367982 100644 --- a/src/gallium/winsys/radeon/drm/radeon_winsys.h +++ b/src/gallium/winsys/radeon/drm/radeon_winsys.h @@ -41,7 +41,7 @@ */ #include "pipebuffer/pb_buffer.h" -#include "libdrm/radeon_surface.h" +#include "radeon_surface.h" #define RADEON_MAX_CMDBUF_DWORDS (16 * 1024) -- 2.7.4