diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-01-10 16:06:52 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2009-01-10 16:06:52 +0000 |
| commit | 1d16daa667e01e8cff2a01d3f1702a4206859b74 (patch) | |
| tree | 0544e3c986498ab11817ec9eb00e40d227317549 /lib | |
| parent | d84c4a5d582bbdc63b89acdbf9181c79abef547e (diff) | |
Switch over to using the kernel *_drm.h headers instead of the copies
thereof provided with libdrm. This has been annoying me forever, and it
a blight caused by developing widely used drivers out of the kernel
tree.
ok matthieu@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libGL/Makefile | 4 | ||||
| -rw-r--r-- | lib/libGL/dri/Makefile.inc | 4 | ||||
| -rw-r--r-- | lib/libGL/libmesa/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile index 00e70e3f0..0254cb982 100644 --- a/lib/libGL/Makefile +++ b/lib/libGL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2009/01/10 16:04:43 oga Exp $ +# $OpenBSD: Makefile,v 1.23 2009/01/10 16:06:51 oga Exp $ .include <bsd.xconf.mk> .if ${XENOCARA_BUILD_DRI:L} == "yes" @@ -46,7 +46,7 @@ CPPFLAGS+= \ -I${MESA}/shader/slang \ -I${GLX} \ -I${X11BASE}/include \ - -I${X11BASE}/include/drm \ + -I/usr/include/dev/pci/drm \ -DGLX_INDIRECT_RENDERING \ -DPTHREADS \ -DHAVE_ALIAS \ diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc index d8e9e1c7b..ea5fec1db 100644 --- a/lib/libGL/dri/Makefile.inc +++ b/lib/libGL/dri/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2008/11/02 15:01:32 matthieu Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2009/01/10 16:06:51 oga Exp $ .include <bsd.xconf.mk> MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa @@ -35,7 +35,7 @@ INCLUDES = \ -I$(TOP)/src/egl/main \ -I$(TOP)/src/egl/drivers/dri \ -I$(X11BASE)/include \ - -I$(X11BASE)/include/drm + -I/usr/include/dev/pci/drm .if ${MACHINE_ARCH} == "i386" CPPFLAGS += \ diff --git a/lib/libGL/libmesa/Makefile b/lib/libGL/libmesa/Makefile index 3bcfab47f..34d9aa408 100644 --- a/lib/libGL/libmesa/Makefile +++ b/lib/libGL/libmesa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2008/11/05 07:18:26 todd Exp $ +# $OpenBSD: Makefile,v 1.7 2009/01/10 16:06:51 oga Exp $ MESA= ${.CURDIR}/../../../dist/Mesa/src/mesa MESA_INCLUDE= ${.CURDIR}/../../../dist/Mesa/include @@ -18,7 +18,7 @@ CPPFLAGS+= \ -I${MESA}/shader/grammar \ -I${MESA}/shader/slang \ -I${X11BASE}/include \ - -I${X11BASE}/include/drm \ + -I/usr/include/dev/pci/drm \ -DGLX_INDIRECT_RENDERING \ -DGLX_DIRECT_RENDERING \ -DUSE_EXTERNAL_DXTN_LIB=1 \ |