X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-x86-static;h=dba6299e47272a24fc7cf4e6a3fdd729d1753df7;hb=636d01bd61cac83e13c3c64874e7e34e828ca93a;hp=a1b3027d57aae9c1eb0345887dc32f2a4b4a1784;hpb=ea93e6d3785cdcd17da1d7cc47a394ba684735db;p=mesa.git

diff --git a/configs/linux-x86-static b/configs/linux-x86-static
index a1b3027d57a..dba6299e472 100644
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -1,28 +1,24 @@
 # Configuration for Linux with x86 optimizations, static libs
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-x86
 
 CONFIG_NAME = linux-x86-static
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -Wall -O3 -ansi -pedantic -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 -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-GLUT_CFLAGS = -fexceptions
-
 MKLIB_OPTIONS = -static
-
+PIC_FLAGS =
 
 # Library names (actual file names)
 GL_LIB_NAME = libGL.a
 GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
 GLW_LIB_NAME = libGLw.a
 OSMESA_LIB_NAME = libOSMesa.a
 
+# Library/program dependencies (static libs don't have dependencies)
+GL_LIB_DEPS = 
+OSMESA_LIB_DEPS = 
+GLU_LIB_DEPS = 
+GLW_LIB_DEPS = 
 
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
+# Need to specify all libraries we may need
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) \
+	-l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXt -lXi -lpthread -lstdc++ -lm