diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-02-10 13:59:35 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-02-10 16:22:19 +0100 |
| commit | b96d50da8b56010a040c93027b4c4eb35f922d51 (patch) | |
| tree | 03bea08d5e7256a651de30650466d72be568ef71 /configs/default | |
| parent | eaf15db895e3a5c6c5ccc2f23a4f0fa522855868 (diff) | |
Revert "mesa: added new linux-gallium and linux-gallium-debug configs"
This reverts commit abbe96cb6e7581a52652030e40442b943a482840.
It only reverts parts of the commit the other parts where related to
libmesagallium changes.
Diffstat (limited to 'configs/default')
| -rw-r--r-- | configs/default | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configs/default b/configs/default index ec8d51ccfe..13bda58f18 100644 --- a/configs/default +++ b/configs/default @@ -79,16 +79,24 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2 # Directories to build LIB_DIR = lib -SRC_DIRS = mesa egl glu glut/glx glew glw +SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw GLU_DIRS = sgi -DRIVER_DIRS = x11 osmesa +DRIVER_DIRS = # Which subdirs under $(TOP)/progs/ to enter: PROGRAM_DIRS = demos redbook samples glsl xdemos # EGL directories EGL_DRIVERS_DIRS = demo +# Gallium directories and +GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices +GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a) +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace +GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a) +GALLIUM_WINSYS_DIRS = xlib egl_xlib + +# Library dependencies #EXTRA_LIB_PATH ?= GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) |