summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-02-07 00:09:02 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-02-07 00:09:02 +0000
commit3fc742cb356bd3ec47b1e10e35182d1152b5825f (patch)
treedc1b0548281f3ff216e0ceeab3e420c36ae3ce2a
parent15e5b56642cca0b4c43a181624be398b2773477d (diff)
Fix the linkage and CFLAGS of the dri libs. they don't segfault immediately
on startup now. still a little sketchy though.
-rw-r--r--lib/libGL/dri/Makefile.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libGL/dri/Makefile.inc b/lib/libGL/dri/Makefile.inc
index 0d8ee7c81..b0228e902 100644
--- a/lib/libGL/dri/Makefile.inc
+++ b/lib/libGL/dri/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2008/02/02 17:24:30 matthieu Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2008/02/07 00:09:01 oga Exp $
.include <bsd.own.mk>
MESA= ${.CURDIR}/../../../../dist/Mesa/src/mesa
@@ -20,7 +20,7 @@ COMMON_BM_SOURCES = \
dri_bufmgr.c \
dri_drmpool.c
-CFLAGS+= -DIN_DRI_DRIVER $(INCLUDES) $(DRIVER_DEFINES)
+CFLAGS+= -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS $(INCLUDES) $(DRIVER_DEFINES)
INCLUDES = \
-I$(TOP)/src/mesa/drivers/dri/common \
@@ -39,7 +39,7 @@ INCLUDES = \
-I$(X11BASE)/include \
-I$(X11BASE)/include/drm
-LDADD= ../../libmesa/libmesa_pic.a -L${X11BASE}/lib -lexpat -ldrm
+LDADD= ../../libmesa/libmesa_pic.a -L${X11BASE}/lib -lexpat -ldrm -lm
.PATH: ${MESA}/drivers/dri/common
.PATH: ${MESA}/drivers/common