Sun Aug 10 07:00:41 2014 UTC ()
Rebase.


(tls)
diff -r1.10 -r1.10.2.1 src/x11/lib/GLU/Makefile
cvs diff -r1.10 -r1.10.2.1 src/x11/lib/GLU/Attic/Makefile (expand / switch to unified diff)

--- src/x11/lib/GLU/Attic/Makefile 2013/09/12 17:14:20 1.10
+++ src/x11/lib/GLU/Attic/Makefile 2014/08/10 07:00:41 1.10.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.10 2013/09/12 17:14:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.10.2.1 2014/08/10 07:00:41 tls 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.xc}/extras/ogl-sample/main/gfx/lib/glu 10GLUDIR= ${X11SRCDIR.xc}/extras/ogl-sample/main/gfx/lib/glu
11 11
12SRCS.libutil= error.c glue.c mipmap.c project.c quad.c registry.c 12SRCS.libutil= error.c glue.c mipmap.c project.c quad.c registry.c
13.PATH: ${GLUDIR}/libutil 13.PATH: ${GLUDIR}/libutil
14 14
@@ -59,22 +59,22 @@ CPPFLAGS.${fn}+=-DLIBRARYBUILD @@ -59,22 +59,22 @@ CPPFLAGS.${fn}+=-DLIBRARYBUILD
59CPPFLAGS+= -I${GLUDIR}/include -DNDEBUG 59CPPFLAGS+= -I${GLUDIR}/include -DNDEBUG
60 60
61SRCS= ${SRCS.libutil} ${SRCS.libtess} \ 61SRCS= ${SRCS.libutil} ${SRCS.libtess} \
62 ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess} 62 ${SRCS.interface} ${SRCS.internals} ${SRCS.nurbtess}
63 63
64LIBDPLIBS=\ 64LIBDPLIBS=\
65 GL ${.CURDIR}/../GL \ 65 GL ${.CURDIR}/../GL \
66 m ${NETBSDSRCDIR}/lib/libm 66 m ${NETBSDSRCDIR}/lib/libm
67 67
68.include <bsd.x11.mk> 68.include <bsd.x11.mk>
69.include <bsd.lib.mk> 69.include <bsd.lib.mk>
70 70
71# Many const char * vs char * issues in xsrc/xfree 71# Many const char * vs char * issues in xsrc/xfree
72.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 72.if defined(HAVE_GCC)
73# XXX -Wno-deprecated doesn't work? 73# XXX -Wno-deprecated doesn't work?
74CXXFLAGS+= -Wno-error 74CXXFLAGS+= -Wno-error
75.endif 75.endif
76 76
77.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k" 77.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k"
78COPTS.sampleCompTop.cc+= -O0 78COPTS.sampleCompTop.cc+= -O0
79.endif 79.endif
80 80