Add a solo-x86 config, and make solo use the x86 glapi

diff --git a/Makefile b/Makefile
index 40d600b4f8501ff2d1e7eae67e3fa32eeb08d267..6b431130cd2ad52d0cd0f2894cf733f6904857c8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ linux-osmesa32 \
 linux-ppc \
 linux-ppc-static \
 linux-solo \
+linux-solo-x86 \
 linux-solo-ia64 \
 linux-sparc \
 linux-sparc5 \

diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86
new file mode 100644 (file)
index 0000000..ad1140a
--- /dev/null
+++ b/configs/linux-solo-x86
@@ -0,0 +1,32 @@
+# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-solo-x86
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+CCOMMON = -DDRI_NEW_INTERFACE_ONLY -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS
+
+CFLAGS = $(CCOMMON) -Wmissing-prototypes -O3 -g -std=c99 -Wundef -fPIC -ffast-math
+
+CXXFLAGS = $(CCOMMON) -Wall -O3 -ansi -pedantic -fPIC
+
+
+ASM_SOURCES = $(X86_SOURCES)
+
+# Library/program dependencies
+GL_LIB_DEPS = -lm -lpthread -lexpat -ldl
+GLU_LIB_DEPS = -L$(LIB_DIR) -lGL -lm
+GLUT_LIB_DEPS = -L$(LIB_DIR) -lGLU -lGL -lm
+APP_LIB_DEPS = -L$(LIB_DIR) -lglut -lGLU -lGL -lm -lpthread
+
+# Directories
+SRC_DIRS = mesa glx glu glut/mini
+DRIVER_DIRS = dri
+PROGRAM_DIRS = miniglx
+
+#DRI_DIRS = fb ffb gamma sis savage
+DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome

diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 84dfa4c443269ad840228e7a027a4e513d37d1f5..4dea619b821039f037706b0edb11ca30cffd5135 100644 (file)
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -18,7 +18,10 @@ C_SOURCES = \
          miniglx.c \
          miniglx_events.c
 
-OBJECTS = $(C_SOURCES:.c=.o)
+X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
+
+OBJECTS = $(C_SOURCES:.c=.o) \
+         $(ASM_SOURCES:.S=.o)
 
 INCLUDES = -I. $(INCLUDE_DIRS)