xserver libX11 mesa git update 15 July

1 files changed, 52 insertions, 53 deletions

diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri
index 3330ff1aa..fdf4b293a 100644
--- a/mesalib/configs/freebsd-dri
+++ b/mesalib/configs/freebsd-dri
@@ -1,53 +1,52 @@
-# -*-makefile-*-

-# Configuration for freebsd-dri: FreeBSD DRI hardware drivers

-

-include $(TOP)/configs/freebsd

-

-CONFIG_NAME = freebsd-dri

-

-# Compiler and flags

-CC = gcc

-CXX = g++

-WARN_FLAGS = -Wall

-OPT_FLAGS = -O -g

-

-EXPAT_INCLUDES = -I/usr/local/include

-X11_INCLUDES = -I/usr/local/include

-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \

-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \

-	-DHAVE_ALIAS

-

-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \

-	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)

-

-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 

-

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

-CFLAGS += -fno-strict-aliasing

-CXXFLAGS += -fno-strict-aliasing

-

-ASM_SOURCES = 

-MESA_ASM_SOURCES = 

-

-# Library/program dependencies

-MESA_MODULES  = $(TOP)/src/mesa/libmesa.a

-

-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`

-LIBDRM_LIB = `pkg-config --libs libdrm`

-DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)

-GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \

-	-lm -pthread $(LIBDRM_LIB)

-

-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm

-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11

-

-

-# Directories

-SRC_DIRS = glx gallium mesa glu glut/glx glw

-DRIVER_DIRS = dri

-

-DRM_SOURCE_PATH=$(TOP)/../drm

-

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

-	   unichrome savage sis

-

+# -*-makefile-*-
+# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
+
+include $(TOP)/configs/freebsd
+
+CONFIG_NAME = freebsd-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+WARN_FLAGS = -Wall
+OPT_FLAGS = -O -g
+
+EXPAT_INCLUDES = -I/usr/local/include
+X11_INCLUDES = -I/usr/local/include
+DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS
+
+CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
+	$(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
+
+CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
+
+# Work around aliasing bugs - developers should comment this out
+CFLAGS += -fno-strict-aliasing
+CXXFLAGS += -fno-strict-aliasing
+
+ASM_SOURCES = 
+MESA_ASM_SOURCES = 
+
+# Library/program dependencies
+MESA_MODULES  = $(TOP)/src/mesa/libmesa.a
+
+LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
+LIBDRM_LIB = `pkg-config --libs libdrm`
+DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
+GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+	-lm -pthread $(LIBDRM_LIB)
+
+GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
+
+
+# Directories
+SRC_DIRS = glx gallium mesa glu glw
+DRIVER_DIRS = dri
+
+DRM_SOURCE_PATH=$(TOP)/../drm
+
+DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \
+	   unichrome savage sis
+