X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-dri-x86;h=ec8242dd68fa7b55883444e618eaede977509ec7;hb=65efe807b9067aa07b382e3c4d9cea6222c5fc6b;hp=812e024975fe5a458a24c8801c2a697f41cc8b00;hpb=18a5ecec899af37f7ee44d7170e19e6dce11838d;p=mesa.git

diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index 812e024975f..ec8242dd68f 100644
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -1,34 +1,17 @@
 # -*-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
 
-# Compiler and flags
-CC = gcc
-CXX = g++
+# Unnecessary on x86, generally.
+PIC_FLAGS = 
 
-CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -D_GNU_SOURCE -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+# Add -m32 to CFLAGS:
+ARCH_FLAGS = -m32
 
-CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE 
-
-ASM_SOURCES = $(X86_SOURCES)
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lexpat -ldl
-
-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
-
-
-# Directories
-SRC_DIRS = mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS = 
-WINDOW_SYSTEM=dri
-
-# Only savage missing:
-#
-DRI_DIRS = dri_client ffb gamma i810 i830 mach64 mga r128 r200 radeon sis tdfx unichrome
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)