X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-x86;h=5970b185ce0d95adae3c0c19d0cd7de522da4f28;hb=2168b87b51e70e8ad914e547c6c922fc33af3a89;hp=ac236ad460f5edf8e7b3398897fdb15bf3537ae8;hpb=a70ad91209b08ebe7122ace6d6656b11d9b04542;p=mesa.git

diff --git a/configs/linux-x86 b/configs/linux-x86
index ac236ad460f..5970b185ce0 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -1,26 +1,11 @@
 # Configuration for Linux with x86 optimizations
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-x86
 
-# Compiler and flags
-CC = gcc
-CXX = g++
+ARCH_FLAGS = -m32 -mmmx -msse -msse2
 
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
-
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-GLUT_CFLAGS = -fexceptions
-
-
-ASM_SOURCES = $(X86_SOURCES)
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
-GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
-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
-APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm
+ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)