Mon Nov 2 06:25:24 2020 UTC ()
ensure PLATFORM_HAS_EGL and ENABLE_EGL are set consistently.


(mrg)
diff -r1.7 -r1.8 src/external/mit/xorg/lib/libepoxy/Makefile
cvs diff -r1.7 -r1.8 src/external/mit/xorg/lib/libepoxy/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/libepoxy/Makefile 2020/11/02 04:48:54 1.7
+++ src/external/mit/xorg/lib/libepoxy/Makefile 2020/11/02 06:25:24 1.8
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.7 2020/11/02 04:48:54 mrg Exp $ 1# $NetBSD: Makefile,v 1.8 2020/11/02 06:25:24 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5LIB= epoxy 5LIB= epoxy
6.PATH: ${X11SRCDIR.${LIB}}/src 6.PATH: ${X11SRCDIR.${LIB}}/src
7.PATH: ${X11SRCDIR.${LIB}}/include/epoxy 7.PATH: ${X11SRCDIR.${LIB}}/include/epoxy
8.PATH: ${X11SRCDIR.${LIB}}/../src 8.PATH: ${X11SRCDIR.${LIB}}/../src
9 9
10SRCS= \ 10SRCS= \
11 dispatch_common.c \ 11 dispatch_common.c \
12 dispatch_glx.c \ 12 dispatch_glx.c \
13 gl_generated_dispatch.c \ 13 gl_generated_dispatch.c \
14 glx_generated_dispatch.c 14 glx_generated_dispatch.c
15 15
16.if ${HAVE_XORG_GLAMOR} != "no" 16.if ${HAVE_XORG_GLAMOR} != "no"
17SRCS+= \ 17SRCS+= \
18 dispatch_egl.c \ 18 dispatch_egl.c \
19 egl_generated_dispatch.c 19 egl_generated_dispatch.c
20CPPFLAGS+= -DENABLE_EGL=1 
21EGL=1 20EGL=1
22.else 21.else
23EGL=0 22EGL=0
24.endif 23.endif
 24CPPFLAGS+= -DPLATFORM_HAS_EGL=${EGL}
 25CPPFLAGS+= -DENABLE_EGL=${EGL}
25 26
26INCSDIR=${X11INCDIR}/epoxy 27INCSDIR=${X11INCDIR}/epoxy
27INCS= \ 28INCS= \
28 common.h \ 29 common.h \
29 gl.h gl_generated.h \ 30 gl.h gl_generated.h \
30 glx.h glx_generated.h \ 31 glx.h glx_generated.h \
31 egl.h egl_generated.h 32 egl.h egl_generated.h
32 33
33CPPFLAGS+= -I${X11SRCDIR.${LIB}}/src 34CPPFLAGS+= -I${X11SRCDIR.${LIB}}/src
34CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include 35CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../include
35CPPFLAGS+= ${X11FLAGS.CONNECTION} 36CPPFLAGS+= ${X11FLAGS.CONNECTION}
36 37
37PKGCONFIG= epoxy 38PKGCONFIG= epoxy