X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;ds=inline;f=configs%2Flinux-dri-x86-64;h=656cf6140d7e3b301b37699233b79ff57d526198;hb=54d688f1484292278535c8ea20bde4a5e8075c7f;hp=dbb3d84d2d511de770bab9f0a7898205b1c0cbb7;hpb=c2530b573076fe0b257710a456a2b8cd714c0d0a;p=mesa.git

diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index dbb3d84d2d5..656cf6140d7 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -1,36 +1,24 @@
 # -*-makefile-*-
 # Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-x86-64
 
-# Compiler and flags
-CC = gcc
-CXX = g++
+ARCH_FLAGS = -m64
 
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -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  -D__AMD64__ -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+ASM_FLAGS = -DUSE_X86_64_ASM
+MESA_ASM_SOURCES = $(X86-64_SOURCES)
+GLAPI_ASM_SOURCES = $(X86-64_API)
 
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -m64 -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D__AMD64__
-
-#ASM_SOURCES = $(X86_SOURCES)
-
-LIB_DIR = $(TOP)/lib64
+LIB_DIR = lib64
 
 # Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib64 -lX11 -lXext -lm -lpthread -lexpat -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -L/usr/X11R6/lib64 -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -lGL -L/usr/X11R6/lib64 -lXt -lX11
-
-# Directories
-SRC_DIRS = mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-# ffb, gamma, and sis are missing because they have
-# not be converted to use the new interface.  Do i810 & i830 really
-# need to be included here?
+EXTRA_LIB_PATH=-L/usr/X11R6/lib64
+
+# sis is missing because it has not been converted to use
+# the new interface.  i810 are missing because there is no x86-64
+# system where they could *ever* be used.
 #
-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome savage
+DRI_DIRS = i915 i965 mach64 mga r128 r200 r300 radeon savage tdfx unichrome