diff options
Diffstat (limited to 'lib/libGL/Makefile')
| -rw-r--r-- | lib/libGL/Makefile | 52 |
1 files changed, 15 insertions, 37 deletions
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile index 0254cb982..005983daf 100644 --- a/lib/libGL/Makefile +++ b/lib/libGL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2009/01/10 16:06:51 oga Exp $ +# $OpenBSD: Makefile,v 1.24 2009/05/17 20:20:23 matthieu Exp $ .include <bsd.xconf.mk> .if ${XENOCARA_BUILD_DRI:L} == "yes" @@ -14,7 +14,7 @@ MESA_INCLUDE= ${.CURDIR}/../../dist/Mesa/include MESA_DRI= ${.CURDIR}/../../dist/Mesa/src/mesa/drivers/dri MESA_MAJOR= 7 -MESA_MINOR= 2 +MESA_MINOR= 4 MESA_TINY= 0 DRI_DRIVER_INSTALL_DIR= ${X11BASE}/lib/modules/dri @@ -37,13 +37,7 @@ CPPFLAGS+= \ -I${MESA_INCLUDE} \ -I${MESA_INCLUDE}/GL/internal \ -I${MESA} \ - -I${MESA}/main \ - -I${MESA}/math \ -I${MESA}/glapi \ - -I${MESA}/tnl \ - -I${MESA}/shader \ - -I${MESA}/shader/grammar \ - -I${MESA}/shader/slang \ -I${GLX} \ -I${X11BASE}/include \ -I/usr/include/dev/pci/drm \ @@ -77,6 +71,7 @@ INCS= \ GLAPI_SOURCES= \ dispatch.c \ glapi.c \ + glapi_getproc.c \ glthread.c \ $(ASM_API) @@ -92,18 +87,6 @@ ASM_API = glapi_x86-64.S SPARC_API = glapi_sparc.S .endif -X11_DRIVER_SOURCES = \ - glxapi.c \ - fakeglx.c \ - xfonts.c \ - xm_api.c \ - xm_buffer.c \ - xm_dd.c \ - xm_glide.c \ - xm_line.c \ - xm_span.c \ - xm_tri.c - GLX_SOURCES= \ glcontextmodes.c \ clientattrib.c \ @@ -122,7 +105,7 @@ GLX_SOURCES= \ indirect_vertex_array.c \ indirect_vertex_program.c \ glxpixel.c \ - pixelstore.c \ + glxpixelstore.c \ render2.c \ renderpix.c \ single2.c \ @@ -136,6 +119,8 @@ GLX_SOURCES= \ dri_glx.c \ XF86dri.c \ glxhash.c \ + dri2_glx.c \ + dri2.c SRCS = $(GLX_SOURCES) \ $(GLAPI_SOURCES) @@ -167,12 +152,18 @@ glxeval.c: ${GLX}/eval.c glxpixel.c: ${GLX}/pixel.c ln -s ${GLX}/pixel.c $@ -CLEANFILES+= glxeval.c glxpixel.c +glxpixelstore.c: ${GLX}/pixelstore.c + ln -s ${GLX}/pixelstore.c $@ + +CLEANFILES+= glxeval.c glxpixel.c glxpixelstore.c gl.pc: ${MESA}/gl.pc.in Makefile sed -e 's,@INSTALL_DIR@,$(X11BASE),' \ -e 's,@INSTALL_LIB_DIR@,${LIBDIR},' \ -e 's,@INSTALL_INC_DIR@,${INCSDIR},' \ + -e 's,@GL_PC_REQ_PRIV@,libdrm >= 2.4.3 dri2proto >= 1.99.3 x11 xext xxf86vm xdamage xfixes,' \ + -e 's,@GL_PC_LIB_PRIV@,-L${LIBDIR} -lXxf86vm -lXext -lXdamage -lXfixes -lX11 -lXau -lXdmcp,' \ + -e 's,@GL_PC_CFLAGS@,-I${INCSDIR},' \ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ < ${MESA}/gl.pc.in > gl.pc @@ -185,6 +176,7 @@ dri.pc: ${MESA_DRI}/dri.pc.in Makefile -e 's,@INSTALL_INC_DIR@,${INCSDIR},' \ -e 's,@DRI_DRIVER_DIR@,${DRI_DRIVER_INSTALL_DIR},' \ -e 's,@VERSION@,$(MESA_MAJOR).$(MESA_MINOR).$(MESA_TINY),' \ + -e 's,@DRI_PC_REQ_PRIV@,,' \ < ${MESA_DRI}/dri.pc.in > dri.pc .endif @@ -211,22 +203,8 @@ CLEANFILES+= gl.pc ${DRI_PC} .if ${MACHINE_ARCH} == amd64 .PATH: ${MESA}/x86-64 .endif -.PATH: ${MESA}/glapi .PATH: ${MESA}/main -.PATH: ${MESA}/math -.PATH: ${MESA}/swrast -.PATH: ${MESA}/swrast_setup -.PATH: ${MESA}/tnl -.PATH: ${MESA}/shader -.PATH: ${MESA}/shader/grammar -.PATH: ${MESA}/shader/slang -.PATH: ${MESA}/shader/slang/MachineIndependent -.PATH: ${MESA}/shader/slang/MachineIndependent/preprocessor -.PATH: ${MESA}/shader/slang/OGLCompilersDLL -.PATH: ${MESA}/shader/slang/OSDependent/Linux -.PATH: ${MESA}/vbo -.PATH: ${MESA}/drivers/common -.PATH: ${MESA}/drivers/x11 +.PATH: ${MESA}/glapi .PATH: ${GLX} .include <bsd.subdir.mk> |