openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-13 04:39:07 +00:00
Code Issues Projects Releases Wiki Activity

Remove COMPILER_VERSION tests used to special-case gcc 2, since it is no

Browse Source 
longer used.
This commit is contained in:
miod
2013-08-22 18:48:45 +00:00
parent 7bf6261972
commit 9eba551554
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.51 2013/02/21 17:45:32 todd Exp $ # $OpenBSD: Makefile,v 1.52 2013/08/22 18:48:45 miod Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -13,7 +13,7 @@ XSERVER= xserver
.endif .endif
.if defined(XENOCARA_BUILD_PIXMAN) .if defined(XENOCARA_BUILD_PIXMAN)
.if ${COMPILER_VERSION:L:Mgcc[34]*} && ${XENOCARA_BUILD_PIXMAN:L} == "yes" && \ .if ${XENOCARA_BUILD_PIXMAN:L} == "yes" && \
${XENOCARA_HAVE_SHARED_LIBS:L} == "yes" ${XENOCARA_HAVE_SHARED_LIBS:L} == "yes"
XSERVER+= kdrive XSERVER+= kdrive
.endif .endif

8
lib/libGL/dri/Makefile.inc
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.16 2012/11/28 13:53:16 mpi Exp $ # $OpenBSD: Makefile.inc,v 1.17 2013/08/22 18:48:46 miod Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
TOP= ${.CURDIR}/../../../../dist/Mesa TOP= ${.CURDIR}/../../../../dist/Mesa
@@ -18,13 +18,9 @@ COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
texmem.c \ texmem.c \
drirenderbuffer.c drirenderbuffer.c
CFLAGS+= -g -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS \ CFLAGS+= -std=c99 -g -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DPTHREADS \
$(INCLUDES) $(DRIVER_DEFINES) $(INCLUDES) $(DRIVER_DEFINES)
.if (${COMPILER_VERSION:L:Mgcc[34]*} != "")
CFLAGS += -std=c99
.endif
INCLUDES = \ INCLUDES = \
-I$(TOP)/src/mesa/drivers/dri/common \ -I$(TOP)/src/mesa/drivers/dri/common \
-I$(TOP)/include \ -I$(TOP)/include \

4
lib/libGLU/Makefile
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2012/08/17 15:16:44 mpi Exp $ # $OpenBSD: Makefile,v 1.18 2013/08/22 18:48:46 miod Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
DEBUG?= DEBUG?=
@@ -124,9 +124,7 @@ CPPFLAGS+= -I${DIST}/include \
-I${GLU}/libnurbs/nurbtess \ -I${GLU}/libnurbs/nurbtess \
-DLIBRARYBUILD -D_EXTENSIONS_ -DLIBRARYBUILD -D_EXTENSIONS_
.if ${COMPILER_VERSION:L:Mgcc[34]*}
LDADD+= -lsupc++ LDADD+= -lsupc++
.endif
NOPROFILE= NOPROFILE=