Fri Jan 2 20:41:51 2015 UTC ()
Pull up following revision(s) (requested by mrg in ticket #370):
	external/mit/xorg/lib/libGLU/Makefile: revision 1.16
switch over to the separate glu sources.


(martin)
diff -r1.15 -r1.15.2.1 src/external/mit/xorg/lib/libGLU/Makefile
cvs diff -r1.15 -r1.15.2.1 src/external/mit/xorg/lib/libGLU/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libGLU/Makefile 2014/07/14 00:22:46 1.15
+++ src/external/mit/xorg/lib/libGLU/Makefile 2015/01/02 20:41:51 1.15.2.1
@@ -1,99 +1,161 @@ @@ -1,99 +1,161 @@
1# $NetBSD: Makefile,v 1.15 2014/07/14 00:22:46 riz Exp $ 1# $NetBSD: Makefile,v 1.15.2.1 2015/01/02 20:41:51 martin Exp $
2 2
3NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :( 3NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
4 4
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7LIB= GLU 7LIB= GLU
8LIBISCXX= yes 8LIBISCXX= yes
9 9
10GLUDIR= ${X11SRCDIR.MesaLib}/src/glu/sgi 10GLUDIR= ${X11SRCDIR.glu}/src
11 11
12SRCS.libutil= error.c glue.c mipmap.c project.c quad.c registry.c 12SRCS.libutil= \
 13 error.c \
 14 glue.c \
 15 mipmap.c \
 16 project.c \
 17 quad.c \
 18 registry.c
13.PATH: ${GLUDIR}/libutil 19.PATH: ${GLUDIR}/libutil
14 20
15SRCS.libtess= dict.c geom.c memalloc.c mesh.c normal.c priorityq.c \ 21SRCS.libtess= \
16 render.c sweep.c tess.c tessmono.c 22 dict.c \
 23 geom.c \
 24 memalloc.c \
 25 mesh.c \
 26 normal.c \
 27 priorityq.c \
 28 render.c \
 29 sweep.c \
 30 tess.c \
 31 tessmono.c
17.PATH: ${GLUDIR}/libtess 32.PATH: ${GLUDIR}/libtess
18 33
19SRCS.interface= bezierEval.cc bezierPatch.cc bezierPatchMesh.cc \ 34SRCS.interface= \
20 glcurveval.cc glinterface.cc glrenderer.cc \ 35 bezierEval.cc \
21 glsurfeval.cc incurveeval.cc insurfeval.cc 36 bezierPatch.cc \
 37 bezierPatchMesh.cc \
 38 glcurveval.cc \
 39 glinterface.cc \
 40 glrenderer.cc \
 41 glsurfeval.cc \
 42 incurveeval.cc \
 43 insurfeval.cc
22.PATH: ${GLUDIR}/libnurbs/interface 44.PATH: ${GLUDIR}/libnurbs/interface
23.for fn in ${SRCS.interface} 
24CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \ 
25 -I${GLUDIR}/libnurbs/nurbtess \ 
26 -DLIBRARYBUILD 
27.endfor 
28 45
29SRCS.internals= arc.cc arcsorter.cc arctess.cc backend.cc \ 46SRCS.internals= \
30 basiccrveval.cc basicsurfeval.cc bin.cc bufpool.cc \ 47 arc.cc \
31 cachingeval.cc ccw.cc coveandtiler.cc curve.cc \ 48 arcsorter.cc \
32 curvelist.cc curvesub.cc dataTransform.cc displaylist.cc \ 49 arctess.cc \
33 flist.cc flistsorter.cc hull.cc intersect.cc \ 50 backend.cc \
34 knotvector.cc mapdesc.cc mapdescv.cc maplist.cc \ 51 basiccrveval.cc \
35 mesher.cc monoTriangulationBackend.cc monotonizer.cc \ 52 basicsurfeval.cc \
36 mycode.cc nurbsinterfac.cc nurbstess.cc patch.cc \ 53 bin.cc \
37 patchlist.cc quilt.cc reader.cc renderhints.cc \ 54 bufpool.cc \
38 slicer.cc sorter.cc splitarcs.cc subdivider.cc \ 55 cachingeval.cc \
39 tobezier.cc trimline.cc trimregion.cc trimvertpool.cc \ 56 ccw.cc \
40 uarray.cc varray.cc 57 coveandtiler.cc \
 58 curve.cc \
 59 curvelist.cc \
 60 curvesub.cc \
 61 dataTransform.cc \
 62 displaylist.cc \
 63 flist.cc \
 64 flistsorter.cc \
 65 hull.cc \
 66 intersect.cc \
 67 knotvector.cc \
 68 mapdesc.cc \
 69 mapdescv.cc \
 70 maplist.cc \
 71 mesher.cc \
 72 monoTriangulationBackend.cc \
 73 monotonizer.cc \
 74 mycode.cc \
 75 nurbsinterfac.cc \
 76 nurbstess.cc \
 77 patch.cc \
 78 patchlist.cc \
 79 quilt.cc \
 80 reader.cc \
 81 renderhints.cc \
 82 slicer.cc \
 83 sorter.cc \
 84 splitarcs.cc \
 85 subdivider.cc \
 86 tobezier.cc \
 87 trimline.cc \
 88 trimregion.cc \
 89 trimvertpool.cc \
 90 uarray.cc \
 91 varray.cc
41.PATH: ${GLUDIR}/libnurbs/internals 92.PATH: ${GLUDIR}/libnurbs/internals
42.for fn in ${SRCS.internals} 93.for fn in ${SRCS.internals}
43CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \ 94CPPFLAGS.${fn}+= -D_EXTENSIONS_
44 -I${GLUDIR}/libnurbs/nurbtess \ 
45 -I${GLUDIR}/libutil \ 
46 -DLIBRARYBUILD -D_EXTENSIONS_ 
47.endfor 95.endfor
48 96
49SRCS.nurbtess= directedLine.cc gridWrap.cc monoChain.cc monoPolyPart.cc \ 97SRCS.nurbtess= \
50 monoTriangulation.cc partitionX.cc partitionY.cc \ 98 directedLine.cc \
51 polyDBG.cc polyUtil.cc primitiveStream.cc quicksort.cc \ 99 gridWrap.cc \
52 rectBlock.cc sampleComp.cc sampleCompBot.cc \ 100 monoChain.cc \
53 sampleCompRight.cc sampleCompTop.cc sampleMonoPoly.cc \ 101 monoPolyPart.cc \
54 sampledLine.cc searchTree.cc 102 monoTriangulation.cc \
 103 partitionX.cc \
 104 partitionY.cc \
 105 polyDBG.cc \
 106 polyUtil.cc \
 107 primitiveStream.cc \
 108 quicksort.cc \
 109 rectBlock.cc \
 110 sampleComp.cc \
 111 sampleCompBot.cc \
 112 sampleCompRight.cc \
 113 sampleCompTop.cc \
 114 sampleMonoPoly.cc \
 115 sampledLine.cc \
 116 searchTree.cc
55.PATH: ${GLUDIR}/libnurbs/nurbtess 117.PATH: ${GLUDIR}/libnurbs/nurbtess
56.for fn in ${SRCS.nurbtess} 
57CPPFLAGS.${fn}+=-I${GLUDIR}/libnurbs/internals \ 
58 -I${GLUDIR}/libnurbs/nurbtess \ 
59 -DLIBRARYBUILD 
60.endfor 
61 118
62CPPFLAGS+= -I${GLUDIR}/include 
63CPPFLAGS+= -DPTHREADS -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD 119CPPFLAGS+= -DPTHREADS -DUSE_XSHM -DHZ=100 -DNDEBUG -DLIBRARYBUILD
 120CPPFLAGS+= -I${GLUDIR}/include \
 121 -I${GLUDIR}/libnurbs/internals \
 122 -I${GLUDIR}/libnurbs/interface \
 123 -I${GLUDIR}/libnurbs/nurbtess
64 124
65SRCS= ${SRCS.libutil} ${SRCS.libtess} \ 125SRCS= ${SRCS.libutil} ${SRCS.libtess} \
66 ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess} 126 ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
67 127
68CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread 128CFLAGS+= -fno-strict-aliasing -fvisibility=hidden -pthread
69 129
70.PATH: ${X11SRCDIR.MesaLib}/include/GL 130.PATH: ${X11SRCDIR.glu}/include/GL
71INCS= glu.h glu_mangle.h 131INCS= glu.h glu_mangle.h
72INCSDIR=${X11INCDIR}/GL 132INCSDIR=${X11INCDIR}/GL
73 133
74LIBDPLIBS= Xext ${.CURDIR}/../libXext \ 134LIBDPLIBS= Xext ${.CURDIR}/../libXext \
75 X11 ${.CURDIR}/../libX11/dynamic \ 135 X11 ${.CURDIR}/../libX11/dynamic \
76 GL ${.CURDIR}/../libGL \ 136 GL ${.CURDIR}/../libGL \
77 Xxf86vm ${.CURDIR}/../libXxf86vm \ 137 Xxf86vm ${.CURDIR}/../libXxf86vm \
78 Xfixes ${.CURDIR}/../libXfixes \ 138 Xfixes ${.CURDIR}/../libXfixes \
79 Xdamage ${.CURDIR}/../libXdamage \ 139 Xdamage ${.CURDIR}/../libXdamage \
80 drm ${.CURDIR}/../libdrm \ 140 drm ${.CURDIR}/../libdrm \
81 m ${NETBSDSRCDIR}/lib/libm 141 m ${NETBSDSRCDIR}/lib/libm
82 142
83PKGCONFIG= glu 143PKGCONFIG= glu
84PKGDIST.glu= ${X11SRCDIR.MesaLib}/src/glu 144PKGDIST.glu= ${X11SRCDIR.glu}
85.include "${.CURDIR}/../libGL/mesa-ver.mk" 145.include "${.CURDIR}/../libGL/mesa-ver.mk"
86PKGCONFIG_VERSION.glu= ${MESA_VER} 146PKGCONFIG_VERSION.glu= ${MESA_VER}
 147PKGCONFIG_SED_FLAGS= \
 148 -e "s,@GLU_REQUIRES@,gl,"
87 149
88.include <bsd.x11.mk> 150.include <bsd.x11.mk>
89.include <bsd.lib.mk> 151.include <bsd.lib.mk>
90 152
91# XXX 153# XXX
92COPTS.arcsorter.cc+= -Wno-error 154COPTS.arcsorter.cc+= -Wno-error
93COPTS.sorter.cc+= -Wno-error 155COPTS.sorter.cc+= -Wno-error
94COPTS.tobezier.cc+= -Wno-error 156COPTS.tobezier.cc+= -Wno-error
95 157
96.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" 158.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k"
97COPTS.sampleCompTop.cc+= -O0 159COPTS.sampleCompTop.cc+= -O0
98.endif 160.endif
99 161