summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorThierry Reding <[email protected]>2006-12-02 23:46:07 +0000
committerThierry Reding <[email protected]>2006-12-02 23:46:07 +0000
commit32e9cb0275fe33628d0081af0f47a28f8bb5e897 (patch)
tree0f7c83c8518db3972b102a80d28851d692197e5c /configs
parent017bade93c5519f3c38617185714495c4a7fad89 (diff)
Update to new upstream release (6.5.2).
Diffstat (limited to 'configs')
-rw-r--r--configs/linux-dri-x86-642
-rw-r--r--configs/linux-fbdev10
2 files changed, 4 insertions, 8 deletions
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 4fbd0a0876d..821ab3e3366 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -20,5 +20,5 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib64
# the new interface. i810 are missing because there is no x86-64
# system where they could *ever* be used.
#
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
+DRI_DIRS = i915tex i915 i965 mach64 mga r128 r200 radeon tdfx unichrome savage r300
diff --git a/configs/linux-fbdev b/configs/linux-fbdev
index 7a5d1b600f9..e36d20a702c 100644
--- a/configs/linux-fbdev
+++ b/configs/linux-fbdev
@@ -4,17 +4,13 @@ include $(TOP)/configs/linux
CONFIG_NAME = linux-fbdev
-DRIVER_DIRS = fbdev
+CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
SRC_DIRS = mesa glu glut/fbdev
-
-CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
-
-
-SRC_DIRS = mesa glu glut/fbdev
-DRIVER_DIRS = fbdev
+DRIVER_DIRS = fbdev osmesa
PROGRAM_DIRS = fbdev demos redbook samples
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread
+OSMESA_LIB_DEPS = -lm -lpthread
GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lgpm -lm