This commit is contained in:
Adam Jackson 2006-04-02 21:45:03 +00:00
parent 4e3a4cfdd1
commit b2097b99a2
3 changed files with 21 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2006-04-02 Adam Jackson <ajax@freedesktop.org>
* hw/kdrive/ati/Makefile.am:
* hw/kdrive/ati/ati.h:
Disable building DRI support in Xati for now.
2006-04-01 Eric Anholt <anholt@FreeBSD.org> 2006-04-01 Eric Anholt <anholt@FreeBSD.org>
reviewed by: keithp reviewed by: keithp

View File

@ -1,16 +1,16 @@
if DRI #if DRI
DRI_INCLUDES = -I$(top_srcdir)/dri \ #DRI_INCLUDES = -I$(top_srcdir)/dri \
-I$(top_srcdir)/drm # -I$(top_srcdir)/drm
DRI_LIBS = $(top_builddir)/dri/libdri.a \ #DRI_LIBS = $(top_builddir)/dri/libdri.a \
$(top_builddir)/drm/libdrm.a # $(top_builddir)/drm/libdrm.a
DRI_SOURCES = ati_dri.c \ #DRI_SOURCES = ati_dri.c \
ati_dri.h \ # ati_dri.h \
ati_dripriv.h \ # ati_dripriv.h \
r128_common.h \ # r128_common.h \
r128_sarea.h \ # r128_sarea.h \
radeon_common.h \ # radeon_common.h \
radeon_sarea.h # radeon_sarea.h
endif #endif
if KDRIVEFBDEV if KDRIVEFBDEV
FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev

View File

@ -39,9 +39,10 @@
#include "kxv.h" #include "kxv.h"
#undef XF86DRI
#ifdef XF86DRI #ifdef XF86DRI
#define USE_DRI #define USE_DRI
#include "libdrm.h" #include "xf86drm.h"
#include "dri.h" #include "dri.h"
#ifdef GLXEXT #ifdef GLXEXT
#include "GL/glxint.h" #include "GL/glxint.h"