diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-12 20:56:18 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-12 20:56:18 +0000 |
| commit | ca14143b18b939ee4506936e77478f8c593802b5 (patch) | |
| tree | 83cf183c0a8814b67d664d002611da95bc78a98f /mesalib/configs | |
| parent | 0f84d9e7c6d9556e3b00adc5db3235c9291eeaa1 (diff) | |
| parent | 2ebdcfeee38bed8c65daa78aa7d18d8d1d93ed85 (diff) | |
| download | vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.gz vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.tar.bz2 vcxsrv-ca14143b18b939ee4506936e77478f8c593802b5.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/configs')
| -rw-r--r-- | mesalib/configs/autoconf.in | 2 | ||||
| -rw-r--r-- | mesalib/configs/default | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in index f33b4f296..a5bbec6de 100644 --- a/mesalib/configs/autoconf.in +++ b/mesalib/configs/autoconf.in @@ -15,7 +15,6 @@ ASM_FLAGS = @ASM_FLAGS@ PIC_FLAGS = @PIC_FLAGS@
DEFINES = @DEFINES@
API_DEFINES = @API_DEFINES@
-GLES_OVERLAY = @GLES_OVERLAY@
CFLAGS = @CPPFLAGS@ @CFLAGS@ \
$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES)
CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@ \
@@ -33,6 +32,7 @@ LLVM_LDFLAGS = @LLVM_LDFLAGS@ LLVM_LIBS = @LLVM_LIBS@
GLW_CFLAGS = @GLW_CFLAGS@
GLUT_CFLAGS = @GLUT_CFLAGS@
+GLX_TLS = @GLX_TLS@
TALLOC_LIBS = @TALLOC_LIBS@
TALLOC_CFLAGS = @TALLOC_CFLAGS@
diff --git a/mesalib/configs/default b/mesalib/configs/default index 1758d7a49..02b66039a 100644 --- a/mesalib/configs/default +++ b/mesalib/configs/default @@ -25,6 +25,7 @@ CXXFLAGS = -O LDFLAGS =
HOST_CFLAGS = $(CFLAGS)
GLU_CFLAGS =
+GLX_TLS = no
# Compiler for building demos/tests/etc
APP_CC = $(CC)
@@ -107,7 +108,7 @@ EGL_DRIVERS_DIRS = glx # Gallium directories and
GALLIUM_DIRS = auxiliary drivers state_trackers
GALLIUM_AUXILIARIES = $(TOP)/src/gallium/auxiliary/libgallium.a
-GALLIUM_DRIVERS_DIRS = softpipe trace rbug identity galahad i915 i965 svga r300 nvfx nv50 failover
+GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad i915 i965 svga r300 nvfx nv50 failover
GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
GALLIUM_WINSYS_DIRS = sw sw/xlib
GALLIUM_TARGET_DIRS = libgl-xlib
|