Module Name: src
Committed By: mrg
Date: Tue Jan 12 03:56:17 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i915: Makefile
src/external/mit/xorg/lib/dri/i965: Makefile
Log Message:
link in libOSMesa as well.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/i965/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.5 src/external/mit/xorg/lib/dri/i915/Makefile:1.6
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.5 Tue Jan 12 00:57:45 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Tue Jan 12 03:56:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/01/12 00:57:45 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/12 03:56:17 mrg Exp $
MODULE= i915
@@ -59,5 +59,6 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.7 src/external/mit/xorg/lib/dri/i965/Makefile:1.8
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.7 Tue Jan 12 00:57:45 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Tue Jan 12 03:56:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/12 00:57:45 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/12 03:56:17 mrg Exp $
MODULE= i965
@@ -90,5 +90,6 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
