mesa: build/use libmesagallium.a for gallium builds

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index cd82c571c7d0c57b84ea2673a1e55b0be5f87c1b..c667a386f3926456065069c5a240c07cebf29d3b 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -13,7 +13,7 @@ CXX = g++
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 
-OPT_FLAGS  = -O -g
+OPT_FLAGS  = -O2 -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
@@ -32,6 +32,11 @@ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 
 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 = 
 
@@ -42,29 +47,26 @@ 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)
-
-
-# This is now 0 by default since it seems to confuse the hell out of people
-# and generate a lot of extra noise on bugzilla.  If you need to build with
-# EGL, do 'make linux-dri USING_EGL=1'
+               -lm -lpthread -ldl $(LIBDRM_LIB)
 
-USING_EGL=0
 
 # Directories
-SRC_DIRS := glx/x11 $(SRC_DIRS)
-ifeq ($(USING_EGL), 1)
-SRC_DIRS := egl $(SRC_DIRS)
-PROGRAM_DIRS = egl
-endif
+SRC_DIRS := glx/x11 egl $(SRC_DIRS)
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
+# EGL directories
+EGL_DRIVERS_DIRS = demo glx
 
-
-DRIVER_DIRS = dri
+DRIVER_DIRS =
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = dri
+GALLIUM_WINSYS_DIRS = drm 
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel 
+
+# XXX: need to figure out a way for gallium and non-gallium builds to
+# coexist:
+#
+
+#DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
+#      savage sis tdfx trident unichrome ffb