qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable pixman (with a workaround from miod@) for m68k, fixes hp300 and mvme68k

Browse Source
This commit is contained in:
todd 2010-08-25 17:44:24 +00:00
parent 379b282322
commit 27291783e7
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libGL/glsl/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1 2010/05/22 20:14:15 matthieu Exp $ # $OpenBSD: Makefile.inc,v 1.2 2010/08/25 17:44:24 todd Exp $
.if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc .if ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == sparc
@ -10,7 +10,9 @@ OBJS = ${C_SOURCES:.c=.so}
CPPFLAGS = \ CPPFLAGS = \
-I${.CURDIR} ${LIBRARY_INCLUDES} -I${.CURDIR} ${LIBRARY_INCLUDES}
.if defined(LIB)
all: ${LIB}_pic.a all: ${LIB}_pic.a
.endif
${LIB}_pic.a: ${OBJS} $(DPADD) ${LIB}_pic.a: ${OBJS} $(DPADD)
@rm -f ${LIB}_pic.a @rm -f ${LIB}_pic.a

7
lib/pixman/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.10 2010/05/11 18:51:21 espie Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.11 2010/08/25 17:44:26 todd Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -12,4 +12,9 @@ CONFIGURE_ARGS += --disable-sse2
CONFIGURE_ARGS += --disable-arm-simd --disable-arm-neon CONFIGURE_ARGS += --disable-arm-simd --disable-arm-neon
.endif .endif
.if ${MACHINE_ARCH} == m68k
CFLAGS += -fno-regmove
CONFIGURE_ARGS += --cache-file=/dev/null
.endif
.include <bsd.xorg.mk> .include <bsd.xorg.mk>

8
share/mk/bsd.xconf.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: bsd.xconf.mk,v 1.12 2010/08/02 18:45:02 matthieu Exp $ # $OpenBSD: bsd.xconf.mk,v 1.13 2010/08/25 17:44:27 todd Exp $
# Shared libs? # Shared libs?
.if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax" .if ${MACHINE_ARCH} == "m88k" || ${MACHINE} == "vax"
@ -14,9 +14,5 @@ XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L}
# Build XCB # Build XCB
XENOCARA_BUILD_XCB?=${XENOCARA_HAVE_SHARED_LIBS} XENOCARA_BUILD_XCB?=${XENOCARA_HAVE_SHARED_LIBS}
# Build pixmain? # Build pixman?
.if ${MACHINE_ARCH} == "m68k"
XENOCARA_BUILD_PIXMAN?=no
.else
XENOCARA_BUILD_PIXMAN?=yes XENOCARA_BUILD_PIXMAN?=yes
.endif