diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | i965_drv_video.c | 3 | ||||
| -rw-r--r-- | i965_drv_video.h | 4 | ||||
| -rw-r--r-- | i965_media.c | 2 | ||||
| -rw-r--r-- | i965_media_mpeg2.c | 2 | ||||
| -rw-r--r-- | i965_render.c | 4 | ||||
| -rw-r--r-- | intel_batchbuffer.c | 2 | ||||
| -rw-r--r-- | intel_driver.h | 2 |
8 files changed, 12 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 42dd515..0a36fa8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,12 +22,12 @@ SUBDIRS = shaders -AM_CFLAGS = -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/x11 @DRM_CFLAGS@ -DIN_LIBVA +AM_CFLAGS = -Wall -I$(top_srcdir)/va -I$(top_srcdir)/src/x11 @DRM_CFLAGS@ i965_drv_video_la_LTLIBRARIES = i965_drv_video.la i965_drv_video_ladir = @LIBVA_DRIVERS_PATH@ i965_drv_video_la_LDFLAGS = -module -avoid-version -no-undefined -Wl,--no-undefined @DRM_LIBS@ -ldrm_intel -i965_drv_video_la_LIBADD = ../src/libva-x11.la -lpthread +i965_drv_video_la_LIBADD = ../va/libva-x11.la -lpthread i965_drv_video_la_SOURCES = \ object_heap.c \ diff --git a/i965_drv_video.c b/i965_drv_video.c index 8f4bfc1..260a053 100644 --- a/i965_drv_video.c +++ b/i965_drv_video.c @@ -30,8 +30,7 @@ #include <string.h> #include <assert.h> -#include "va_backend.h" -#include "va_dricommon.h" +#include "va/x11/va_dricommon.h" #include "intel_driver.h" #include "intel_memman.h" diff --git a/i965_drv_video.h b/i965_drv_video.h index c95c799..fa09869 100644 --- a/i965_drv_video.h +++ b/i965_drv_video.h @@ -30,7 +30,9 @@ #ifndef _I965_DRV_VIDEO_H_ #define _I965_DRV_VIDEO_H_ -#include "va.h" +#include <va/va.h> +#include <va/va_backend.h> + #include "object_heap.h" #include "intel_driver.h" diff --git a/i965_media.c b/i965_media.c index f7d5846..82c5652 100644 --- a/i965_media.c +++ b/i965_media.c @@ -31,7 +31,7 @@ #include <string.h> #include <assert.h> -#include "va_backend.h" +#include <va/va_backend.h> #include "intel_batchbuffer.h" #include "intel_driver.h" diff --git a/i965_media_mpeg2.c b/i965_media_mpeg2.c index 6a14e9e..83ee505 100644 --- a/i965_media_mpeg2.c +++ b/i965_media_mpeg2.c @@ -31,7 +31,7 @@ #include <string.h> #include <assert.h> -#include "va_backend.h" +#include <va/va_backend.h> #include "intel_batchbuffer.h" #include "intel_driver.h" diff --git a/i965_render.c b/i965_render.c index f3e89c2..6221c52 100644 --- a/i965_render.c +++ b/i965_render.c @@ -35,8 +35,8 @@ #include <string.h> #include <assert.h> -#include "va_backend.h" -#include "va_dricommon.h" +#include <va/va_backend.h> +#include "va/x11/va_dricommon.h" #include "intel_batchbuffer.h" #include "intel_driver.h" diff --git a/intel_batchbuffer.c b/intel_batchbuffer.c index 46c9496..21e5719 100644 --- a/intel_batchbuffer.c +++ b/intel_batchbuffer.c @@ -28,7 +28,7 @@ #include <string.h> #include <assert.h> -#include "va_backend.h" +#include <va/va_backend.h> #include "intel_batchbuffer.h" diff --git a/intel_driver.h b/intel_driver.h index 84df0aa..9ab95b7 100644 --- a/intel_driver.h +++ b/intel_driver.h @@ -9,7 +9,7 @@ #include <i915_drm.h> #include <intel_bufmgr.h> -#include "va_backend.h" +#include <va/va_backend.h> #if defined(__GNUC__) #define INLINE __inline__ |