diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-02 21:45:03 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-02 21:45:03 +0000 |
| commit | b2097b99a2e6cc045ee9b6d80946bc06c4d9302c (patch) | |
| tree | 03fc575ca4ed405c4561e595d8883c24a1f64faa /hw/kdrive | |
| parent | 4e3a4cfdd1d7153eb88aab05ed02ddb32601ae93 (diff) | |
../stub
Diffstat (limited to 'hw/kdrive')
| -rw-r--r-- | hw/kdrive/ati/Makefile.am | 26 | ||||
| -rw-r--r-- | hw/kdrive/ati/ati.h | 3 |
2 files changed, 15 insertions, 14 deletions
diff --git a/hw/kdrive/ati/Makefile.am b/hw/kdrive/ati/Makefile.am index 22f763b80..b23418129 100644 --- a/hw/kdrive/ati/Makefile.am +++ b/hw/kdrive/ati/Makefile.am @@ -1,16 +1,16 @@ -if DRI -DRI_INCLUDES = -I$(top_srcdir)/dri \ - -I$(top_srcdir)/drm -DRI_LIBS = $(top_builddir)/dri/libdri.a \ - $(top_builddir)/drm/libdrm.a -DRI_SOURCES = ati_dri.c \ - ati_dri.h \ - ati_dripriv.h \ - r128_common.h \ - r128_sarea.h \ - radeon_common.h \ - radeon_sarea.h -endif +#if DRI +#DRI_INCLUDES = -I$(top_srcdir)/dri \ +# -I$(top_srcdir)/drm +#DRI_LIBS = $(top_builddir)/dri/libdri.a \ +# $(top_builddir)/drm/libdrm.a +#DRI_SOURCES = ati_dri.c \ +# ati_dri.h \ +# ati_dripriv.h \ +# r128_common.h \ +# r128_sarea.h \ +# radeon_common.h \ +# radeon_sarea.h +#endif if KDRIVEFBDEV FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev diff --git a/hw/kdrive/ati/ati.h b/hw/kdrive/ati/ati.h index 5ffd227ca..188d0b057 100644 --- a/hw/kdrive/ati/ati.h +++ b/hw/kdrive/ati/ati.h @@ -39,9 +39,10 @@ #include "kxv.h" +#undef XF86DRI #ifdef XF86DRI #define USE_DRI -#include "libdrm.h" +#include "xf86drm.h" #include "dri.h" #ifdef GLXEXT #include "GL/glxint.h" |