head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.1.2.1
	netbsd-7-1-2-RELEASE:1.1.1.1.2.1
	netbsd-7-1-1-RELEASE:1.1.1.1.2.1
	netbsd-7-1:1.1.1.1.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.1.2.1
	netbsd-7-1-RC2:1.1.1.1.2.1
	netbsd-7-1-RC1:1.1.1.1.2.1
	netbsd-7-0-2-RELEASE:1.1.1.1.2.1
	netbsd-7-0-1-RELEASE:1.1.1.1.2.1
	netbsd-7-0:1.1.1.1.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.1.2.1
	netbsd-7-0-RC3:1.1.1.1.2.1
	netbsd-7-0-RC2:1.1.1.1.2.1
	netbsd-7-0-RC1:1.1.1.1.2.1
	netbsd-7:1.1.1.1.0.2
	netbsd-7-base:1.1.1.1
	MesaLib-7-11-2:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.12.18.06.11.44;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

1.1
date	2014.07.09.19.38.45;	author riastradh;	state Exp;
branches
	1.1.1.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.1
date	2014.07.09.19.38.45;	author riastradh;	state Exp;
branches
	1.1.1.1.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.1.2.1
date	2015.01.06.09.26.30;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@# -*-makefile-*-

COMMON_GALLIUM_SOURCES = \
        ../common/utils.c \
        ../common/vblank.c \
        ../common/dri_util.c \
        ../common/xmlconfig.c

COMMON_SOURCES = $(COMMON_GALLIUM_SOURCES) \
        ../../common/driverfuncs.c \
        ../common/texmem.c \
        ../common/drirenderbuffer.c

INCLUDES = $(SHARED_INCLUDES) $(EXPAT_INCLUDES)

OBJECTS = $(C_SOURCES:.c=.o) \
	  $(CXX_SOURCES:.cpp=.o) \
	  $(ASM_SOURCES:.S=.o) 


### Include directories
SHARED_INCLUDES = \
	-I. \
	-I$(TOP)/src/mesa/drivers/dri/common \
	-Iserver \
	-I$(TOP)/include \
	-I$(TOP)/src/mapi \
	-I$(TOP)/src/mesa \
	-I$(TOP)/src/egl/main \
	-I$(TOP)/src/egl/drivers/dri \
	$(LIBDRM_CFLAGS)

INCLUDES += $(API_DEFINES)
CXXFLAGS += $(API_DEFINES)
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@import MesaLib 7.11.2

Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a
new shader language compiler, and various other improvements too
numerous to list here; see <http://www.mesa3d.org/relnotes.html> for
details.
@
text
@@


1.1.1.1.2.1
log
@File removals that accidently did not happen during pullup of the new
MesaLib for ticket #381
@
text
@@

