diff options
| -rw-r--r-- | lib/libGL/dri/Makefile | 15 | ||||
| -rw-r--r-- | lib/libGL/dri/r300g/Makefile | 4 | ||||
| -rw-r--r-- | lib/libGL/dri/r600g/Makefile | 4 | ||||
| -rw-r--r-- | lib/libGL/gallium/drivers/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.xconf.mk | 4 |
5 files changed, 17 insertions, 14 deletions
diff --git a/lib/libGL/dri/Makefile b/lib/libGL/dri/Makefile index baa005cb5..1079ab269 100644 --- a/lib/libGL/dri/Makefile +++ b/lib/libGL/dri/Makefile @@ -1,17 +1,20 @@ -# $OpenBSD: Makefile,v 1.16 2013/06/17 23:30:25 jsg Exp $ +# $OpenBSD: Makefile,v 1.17 2013/08/12 04:16:52 jsg Exp $ .include <bsd.xconf.mk> SUBDIR= swrast .if ${MACHINE} == i386 || ${MACHINE} == amd64 -SUBDIR+= i810 i915 i965 radeon r200 r300 r600 -.elif ${MACHINE} == macppc -SUBDIR+= radeon r200 r300 +SUBDIR+= i810 i915 i965 radeon r200 +.elif ${MACHINE} == macppc || ${MACHINE} == sparc64 +SUBDIR+= radeon r200 .endif -.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm" +.if ${XENOCARA_BUILD_GALLIUM} == "llvm" SUBDIR+=swrastg -.if ${MACHINE} == i386 || ${MACHINE} == amd64 || ${MACHINE} == macppc +.endif + +.if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm" +.if ${MACHINE} == i386 || ${MACHINE} == amd64 || ${MACHINE} == macppc || ${MACHINE} == sparc64 SUBDIR+= r300g r600g .endif .endif diff --git a/lib/libGL/dri/r300g/Makefile b/lib/libGL/dri/r300g/Makefile index 5c800876d..da47582d2 100644 --- a/lib/libGL/dri/r300g/Makefile +++ b/lib/libGL/dri/r300g/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2013/06/13 10:39:28 jsg Exp $ +# $OpenBSD: Makefile,v 1.2 2013/08/12 04:16:52 jsg Exp $ -LIB= r300g_dri.so +LIB= r300_dri.so CPPFLAGS= \ -I${GALLIUM}/include \ diff --git a/lib/libGL/dri/r600g/Makefile b/lib/libGL/dri/r600g/Makefile index fbc2fef19..949a66c98 100644 --- a/lib/libGL/dri/r600g/Makefile +++ b/lib/libGL/dri/r600g/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2013/06/17 23:30:25 jsg Exp $ +# $OpenBSD: Makefile,v 1.2 2013/08/12 04:16:52 jsg Exp $ -LIB= r600g_dri.so +LIB= r600_dri.so CPPFLAGS= \ -I${GALLIUM}/include \ diff --git a/lib/libGL/gallium/drivers/Makefile b/lib/libGL/gallium/drivers/Makefile index b8ae77714..801ae224a 100644 --- a/lib/libGL/gallium/drivers/Makefile +++ b/lib/libGL/gallium/drivers/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2013/06/17 23:30:25 jsg Exp $ +# $OpenBSD: Makefile,v 1.5 2013/08/12 04:16:52 jsg Exp $ .include <bsd.xconf.mk> SUBDIR= rbug softpipe trace @@ -8,7 +8,7 @@ SUBDIR+= llvmpipe .endif .if ${XENOCARA_BUILD_GALLIUM:L} == "yes" || ${XENOCARA_BUILD_GALLIUM} == "llvm" && - (${MACHINE} == i386 || ${MACHINE} == amd64 || ${MACHINE} == macppc) + (${MACHINE} == i386 || ${MACHINE} == amd64 || ${MACHINE} == macppc || ${MACHINE} == sparc64) SUBDIR+= r300 r600 .endif diff --git a/share/mk/bsd.xconf.mk b/share/mk/bsd.xconf.mk index 937ebcbdb..69447ea6f 100644 --- a/share/mk/bsd.xconf.mk +++ b/share/mk/bsd.xconf.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xconf.mk,v 1.24 2013/04/14 10:23:04 mpi Exp $ +# $OpenBSD: bsd.xconf.mk,v 1.25 2013/08/12 04:16:52 jsg Exp $ # Shared libs? .if ${MACHINE} == "vax" @@ -10,7 +10,7 @@ XENOCARA_HAVE_SHARED_LIBS?=yes # Build GL libs and apps? XENOCARA_BUILD_GL?=${XENOCARA_HAVE_SHARED_LIBS:L} XENOCARA_BUILD_DRI?=${XENOCARA_HAVE_SHARED_LIBS:L} -XENOCARA_BUILD_GALLIUM?=no +XENOCARA_BUILD_GALLIUM?=${XENOCARA_HAVE_SHARED_LIBS:L} # Build pixman? .if ${MACHINE} == "vax" |