summaryrefslogtreecommitdiff
path: root/src/xvmc
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-06-12 13:47:35 -0700
committerEric Anholt <eric@anholt.net>2008-06-12 13:47:35 -0700
commitf07acbdaac95931d184ea2c557edb632e577eb47 (patch)
tree7a45cb9f4bc29f27aec0ae1d3794704f2b2c7140 /src/xvmc
parent754df0aa55c4b5f0c3c415ad97d7612504410229 (diff)
Require libdrm 2.4.0 always since we need the bufmgr code.
This lets us remove a lot of conditional compile stuff in the DRI case, as if we're doing DRI and have 2.4.0, we can rely on GEM ioctls existing.
Diffstat (limited to 'src/xvmc')
-rw-r--r--src/xvmc/Makefile.am5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xvmc/Makefile.am b/src/xvmc/Makefile.am
index 345160fb..2f75cc56 100644
--- a/src/xvmc/Makefile.am
+++ b/src/xvmc/Makefile.am
@@ -4,7 +4,7 @@ lib_LTLIBRARIES=libI810XvMC.la libIntelXvMC.la
libI810XvMC_la_SOURCES = I810XvMC.c \
I810XvMC.h
-libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ \
+libI810XvMC_la_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
-I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libI810XvMC_la_LDFLAGS = -version-number 1:0:0
libI810XvMC_la_LIBADD = @DRI_LIBS@
@@ -22,7 +22,8 @@ libIntelXvMC_la_SOURCES = intel_xvmc.c \
xf86dri.h \
xf86dristr.h
-libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
+libIntelXvMC_la_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ \
+ @XVMCLIB_CFLAGS@ -I$(top_srcdir)/src -DTRUE=1 -DFALSE=0
libIntelXvMC_la_LDFLAGS = -version-number 1:0:0
libIntelXvMC_la_LIBADD = @DRI_LIBS@
endif