summaryrefslogtreecommitdiff
path: root/x11/Xserver
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2005-05-14 19:27:56 +0000
committermartin <martin@NetBSD.org>2005-05-14 19:27:56 +0000
commit4f8a6aa79a51254932cf94de6aaf8c8af5610d08 (patch)
tree9c987ab3a5e6d3add77c6cc061484c97d25e9d54 /x11/Xserver
parent4ed2a0cea6de2575dbd0fd680f0588347e754612 (diff)
We need ${X11FLAGS.EXTENSION} here, because it carries what xsrc calls
GlxExtraDefines - and those are very important on 64 bit archs at least (-D__GLX_ALIGN64)
Diffstat (limited to 'x11/Xserver')
-rw-r--r--x11/Xserver/GL/GLcore/Makefile.GLcore4
-rw-r--r--x11/Xserver/GL/glx/Makefile.glx4
2 files changed, 4 insertions, 4 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}