define USE_XAA here for xorg-server 1.10.

for xorg-server 1.18 builds, copy some files from xorg-server 1.10.

this may not work with xorg-server 1.18, i'll test later.
This commit is contained in:
mrg 2016-08-16 07:08:17 +00:00
parent dce7324f6a
commit f5d1493562

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.19 2015/05/28 14:36:45 rjs Exp $
# $NetBSD: Makefile,v 1.20 2016/08/16 07:08:17 mrg Exp $
.include <bsd.own.mk>
@ -20,6 +20,11 @@ SRCS.DRI= radeon_dri.c
CPPFLAGS+= ${X11FLAGS.DRI}
.endif
# XXX
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DUSE_XAA
.endif
.if ${X11DRI} != "no"
# XXX
. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@ -54,7 +59,14 @@ CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
-I${DESTDIR}${X11INCDIR}/libdrm \
-I${X11SRCDIR.${DRIVER}}/../include
-I${X11SRCDIR.${DRIVER}}/../include \
-I${X11SRCDIR.${DRIVER}}/../xorg-server-copy
.if ${XORG_SERVER_SUBDIR} != "xorg-server.old"
CPPFLAGS+= -DHAVE_XORG_LIST
# XXX These have been copied from xorg-server 1.10.6.
SRCS+= fi1236.c msp3430.c tda9885.c uda1380.c
.PATH: ${X11SRCDIR.${DRIVER}}/../xorg-server-copy
.endif
# XXX
COPTS+= -Wno-error