head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1:1.1.1.3.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1-RC2:1.1.1.3.2.1
	netbsd-7-1-RC1:1.1.1.3.2.1
	netbsd-7-0-2-RELEASE:1.1.1.3.2.1
	netbsd-7-0-1-RELEASE:1.1.1.3.2.1
	netbsd-7-0:1.1.1.3.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.3.2.1
	netbsd-7-0-RC3:1.1.1.3.2.1
	netbsd-7-0-RC2:1.1.1.3.2.1
	netbsd-7-0-RC1:1.1.1.3.2.1
	netbsd-6-0-6-RELEASE:1.1.1.2
	netbsd-6-1-5-RELEASE:1.1.1.2
	netbsd-7:1.1.1.3.0.2
	netbsd-7-base:1.1.1.3
	MesaLib-7-11-2:1.1.1.3
	netbsd-6-1-4-RELEASE:1.1.1.2
	netbsd-6-0-5-RELEASE:1.1.1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2
	riastradh-drm2:1.1.1.2.0.8
	riastradh-drm2-base:1.1.1.2
	netbsd-6-1-3-RELEASE:1.1.1.2
	netbsd-6-0-4-RELEASE:1.1.1.2
	netbsd-6-1-2-RELEASE:1.1.1.2
	netbsd-6-0-3-RELEASE:1.1.1.2
	netbsd-6-1-1-RELEASE:1.1.1.2
	netbsd-6-1:1.1.1.2.0.6
	netbsd-6-0-2-RELEASE:1.1.1.2
	netbsd-6-1-RELEASE:1.1.1.2
	netbsd-6-1-RC4:1.1.1.2
	netbsd-6-1-RC3:1.1.1.2
	netbsd-6-1-RC2:1.1.1.2
	netbsd-6-1-RC1:1.1.1.2
	netbsd-6-0-1-RELEASE:1.1.1.2
	netbsd-6-0:1.1.1.2.0.4
	netbsd-6-0-RELEASE:1.1.1.2
	netbsd-6-0-RC2:1.1.1.2
	netbsd-6-0-RC1:1.1.1.2
	netbsd-6:1.1.1.2.0.2
	netbsd-6-base:1.1.1.2
	MesaLib-7-8-2:1.1.1.2
	MesaLib-7-7-1:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


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

1.1
date	2010.05.23.21.22.15;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2010.05.23.21.22.15;	author mrg;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	2010.07.19.05.31.51;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2014.07.09.19.38.34;	author riastradh;	state Exp;
branches
	1.1.1.3.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.3.2.1
date	2015.01.06.09.26.19;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@# -*-makefile-*-
# Configuration for Linux and LLVM with debugging info
# Builds the llvmpipe gallium driver

include $(TOP)/configs/linux

CONFIG_NAME = linux-llvm

#GALLIUM_AUXILIARY_DIRS += gallivm

# Add llvmpipe driver
GALLIUM_DRIVERS_DIRS += llvmpipe

OPT_FLAGS = -g -ansi -pedantic
DEFINES += -DDEBUG -DDEBUG_MATH -DGALLIUM_LLVMPIPE -DHAVE_UDIS86

# override -std=c99
CFLAGS += -std=gnu99

LLVM_VERSION := $(shell llvm-config --version)

ifeq ($(LLVM_VERSION),)
  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
  MESA_LLVM=0
else
  MESA_LLVM=1
#  $(info Using LLVM version: $(LLVM_VERSION))
endif

ifeq ($(MESA_LLVM),1)
#  LLVM_CFLAGS=`llvm-config --cflags`
  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
  LLVM_LIBS = $(shell llvm-config --libs backend bitreader engine ipo interpreter instrumentation)
  MKLIB_OPTIONS=-cplusplus
else
  LLVM_CFLAGS=
  LLVM_CXXFLAGS=
endif

LD = g++
GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaLib-7.7.1
@
text
@@


1.1.1.2
log
@import Mesa 7.8.2, lib part.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@d2 1
a2 1
# Configuration for Linux and LLVM with optimizations
d9 2
d14 2
a15 4
OPT_FLAGS = -O3 -ansi -pedantic
ARCH_FLAGS = -m32 -mmmx -msse -msse2 -mstackrealign

DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE -DDRAW_LLVM -DHAVE_UDIS86
d34 1
a34 1
  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)
@


1.1.1.3
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
@d13 1
a13 1
ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
d15 1
a15 1
DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE
a26 2
  HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
  DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
d31 4
a34 4
  LLVM_CFLAGS=`llvm-config --cppflags`
  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
  LLVM_LDFLAGS = $(shell llvm-config --ldflags)
  LLVM_LIBS = $(shell llvm-config --libs)
d42 1
a42 1
GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
@


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