summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/Xserver/GL/GLcore/Makefile.GLcore4
-rw-r--r--x11/Xserver/GL/glx/Makefile.glx4
-rw-r--r--x11/lib/GL/Makefile5
-rw-r--r--x11/lib/OSmesa/Makefile4
4 files changed, 9 insertions, 8 deletions
diff --git a/x11/Xserver/GL/GLcore/Makefile.GLcore b/x11/Xserver/GL/GLcore/Makefile.GLcore
index a583a7b28d9..b1857248160 100644
--- a/x11/Xserver/GL/GLcore/Makefile.GLcore
+++ b/x11/Xserver/GL/GLcore/Makefile.GLcore
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.GLcore,v 1.8 2005/03/19 21:41:58 christos Exp $
+# $NetBSD: Makefile.GLcore,v 1.9 2005/05/14 19:27:56 martin Exp $
LIB= GLcore
@@ -90,7 +90,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/programs/Xserver/GL/include \
-I${X11SRCDIR.xc}/programs/Xserver/GL/mesa/X
-CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA
+CPPFLAGS+= ${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA
.if ${MACHINE_CPU} == "sh5"
COPTS.s_triangle.c= -O0
diff --git a/x11/Xserver/GL/glx/Makefile.glx b/x11/Xserver/GL/glx/Makefile.glx
index 3faf0ad8d99..9afd73bb2a6 100644
--- a/x11/Xserver/GL/glx/Makefile.glx
+++ b/x11/Xserver/GL/glx/Makefile.glx
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.6 2005/03/19 21:41:58 christos Exp $
+# $NetBSD: Makefile.glx,v 1.7 2005/05/14 19:27:56 martin Exp $
LIB= glx
@@ -23,7 +23,7 @@ CPPFLAGS+= -I${X11SRCDIR.xc}/programs/Xserver/GL/glx \
-I${X11SRCDIR.xc}/extras/Mesa/include \
-I${X11SRCDIR.xc}/lib/GL/include
-CPPFLAGS+= -DGLXEXT -DGLX_USE_MESA
+CPPFLAGS+= ${X11FLAGS.EXTENSION} -DGLXEXT -DGLX_USE_MESA
.include <bsd.x11.mk>
LIBDIR= ${XMODULEDIR}
diff --git a/x11/lib/GL/Makefile b/x11/lib/GL/Makefile
index 597e663d2fe..73ef2f101e6 100644
--- a/x11/lib/GL/Makefile
+++ b/x11/lib/GL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/20 23:52:05 rtr Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/14 19:27:56 martin Exp $
.include <bsd.own.mk>
@@ -125,7 +125,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/drivers/dri/common \
- ${X11FLAGS.THREADS} -DGLXEXT -DGLX_USE_MESA
+ ${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION} -DGLXEXT \
+ -DGLX_USE_MESA
LIBDPLIBS= Xext ${.CURDIR}/../Xext \
X11 ${.CURDIR}/../X11/dynamic
diff --git a/x11/lib/OSmesa/Makefile b/x11/lib/OSmesa/Makefile
index ab3badcf7e2..4b0bb34e917 100644
--- a/x11/lib/OSmesa/Makefile
+++ b/x11/lib/OSmesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/03/22 19:47:59 rtr Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/14 19:27:56 martin Exp $
NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
@@ -57,7 +57,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/main \
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/glapi \
-I${X11SRCDIR.xc}/extras/Mesa/src/mesa/shader \
- ${X11FLAGS.THREADS} \
+ ${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION} \
-DGLXEXT -DGLX_USE_MESA
.if ${MACHINE_ARCH} == "i386"