svn merge ^/branches/released .

1 files changed, 71 insertions, 71 deletions

diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
index 5e3593787..1c94ed0b1 100644
--- a/mesalib/configs/linux-dri
+++ b/mesalib/configs/linux-dri
@@ -1,71 +1,71 @@
-# -*-makefile-*-

-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others

-

-include $(TOP)/configs/default

-

-CONFIG_NAME = linux-dri

-

-# Compiler and flags

-CC = gcc

-CXX = g++

-

-#MKDEP = /usr/X11R6/bin/makedepend

-#MKDEP = gcc -M

-#MKDEP_OPTIONS = -MF depend

-

-OPT_FLAGS  = -O2 -g

-PIC_FLAGS  = -fPIC

-

-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.

-ARCH_FLAGS ?=

-

-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \

-	-D_BSD_SOURCE -D_GNU_SOURCE \

-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

-	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN

-

-X11_INCLUDES = -I/usr/X11R6/include

-

-CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \

-	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)

-

-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)

-

-GLUT_CFLAGS = -fexceptions

-

-# Work around aliasing bugs - developers should comment this out

-CFLAGS += -fno-strict-aliasing

-CXXFLAGS += -fno-strict-aliasing

-

-MESA_ASM_SOURCES = 

-

-# Library/program dependencies

-EXTRA_LIB_PATH=-L/usr/X11R6/lib

-

-LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)

-LIBDRM_LIB = $(shell pkg-config --libs libdrm)

-DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB)

-GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

-		-lm -lpthread -ldl $(LIBDRM_LIB)

-

-

-# Directories

-SRC_DIRS := glx egl $(SRC_DIRS)

-

-# EGL directories

-EGL_DRIVERS_DIRS = glx

-

-DRIVER_DIRS = dri

-GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965

-GALLIUM_TARGET_DIRS = 

-GALLIUM_STATE_TRACKERS_DIRS = egl

-

-DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \

-	savage sis tdfx unichrome swrast

-

-INTEL_LIBS = `pkg-config --libs libdrm_intel`

-INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`

-

-RADEON_LIBS = `pkg-config --libs libdrm_radeon`

-RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`

+# -*-makefile-*-
+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+#MKDEP = /usr/X11R6/bin/makedepend
+#MKDEP = gcc -M
+#MKDEP_OPTIONS = -MF depend
+
+OPT_FLAGS  = -O2 -g
+PIC_FLAGS  = -fPIC
+
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+	-D_BSD_SOURCE -D_GNU_SOURCE \
+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+
+X11_INCLUDES = -I/usr/X11R6/include
+
+CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
+
+CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+
+GLUT_CFLAGS = -fexceptions
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+MESA_ASM_SOURCES = 
+
+# Library/program dependencies
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
+
+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
+LIBDRM_LIB = $(shell pkg-config --libs libdrm)
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+		-lm -lpthread -ldl $(LIBDRM_LIB)
+
+
+# Directories
+SRC_DIRS := glx egl $(SRC_DIRS)
+
+# EGL directories
+EGL_DRIVERS_DIRS = glx
+
+DRIVER_DIRS = dri
+GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965
+GALLIUM_TARGET_DIRS = 
+GALLIUM_STATE_TRACKERS_DIRS = egl
+
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon \
+	savage sis tdfx unichrome swrast
+
+INTEL_LIBS = `pkg-config --libs libdrm_intel`
+INTEL_CFLAGS = `pkg-config --cflags libdrm_intel`
+
+RADEON_LIBS = `pkg-config --libs libdrm_radeon`
+RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon`