diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2004-09-07 00:41:40 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2004-09-07 00:41:40 +0000 |
| commit | e520b72e8901058729780620e3a98b4014f736f2 (patch) | |
| tree | 1bceaae218fb9ab3bcfeca1c367f1af92fed7279 | |
| parent | 58c4937e124138dd11bfd36e37d401ff73f5e7c4 (diff) | |
Add a solo-x86 config, and make solo use the x86 glapi
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | configs/linux-solo-x86 | 32 | ||||
| -rw-r--r-- | src/glx/mini/Makefile | 5 |
3 files changed, 37 insertions, 1 deletions
@@ -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 index 00000000000..ad1140aafa0 --- /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 84dfa4c4432..4dea619b821 100644 --- 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) |