i915: Fixed cubemap layouts

[mesa.git] / configs / linux-dri

diff --git a/configs/linux-dri b/configs/linux-dri
index 70c71e58126ed573bbdf03d64aad0e429cfa3684..9fd3721265661f1eb50626d0e087f661ae727782 100644 (file)
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -9,32 +9,63 @@ CONFIG_NAME = linux-dri
 CC = gcc
 CXX = g++
 
-CFLAGS = -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -D_GNU_SOURCE -DGLX_DIRECT_RENDERING -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+#MKDEP = /usr/X11R6/bin/makedepend
+#MKDEP = gcc -M
+#MKDEP_OPTIONS = -MF depend
 
-CXXFLAGS = -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE 
+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
 
-#ASM_SOURCES = $(X86_SOURCES)
+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)
+
+
+MESA_ASM_SOURCES = 
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib -lXt -lXm -lX11
+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'
+
+USING_EGL=0
+
 # Directories
-SRC_DIRS = mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
+SRC_DIRS := glx/x11 $(SRC_DIRS)
+ifeq ($(USING_EGL), 1)
+SRC_DIRS := egl $(SRC_DIRS)
+PROGRAM_DIRS = egl
+endif
+
 
-# This kindof sucks - we only need the header files from here:
-# 
-DRM_SOURCE_PATH=/home/progs/drm
 
-# Only savage missing:
-#
-DRI_DIRS = dri_client ffb gamma i810 i830 mach64 mga r128 r200 radeon sis tdfx unichrome
+DRIVER_DIRS =
+WINDOW_SYSTEM = dri
+GALLIUM_WINSYS_DIRS = dri egl_xlib
+GALLIUM_WINSYS_COMMON_DIRS = intel_drm
 
+# gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = intel