summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-18 14:25:04 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-18 14:25:04 +0900
commitbfd5916eafb9a97ad10f1d4a8738e7dcb02e04f4 (patch)
tree4d9acef3ff83664c8c4109d379eda69b1e25c222 /configs
parent56bf73b1fb974e2223c9a4dcc96d39dac84a2df5 (diff)
Code reorganization: split gallium and mesa makefiles.
In other words, don't build src/gallium source code from within src/mesa/Makefile. Also, allow to customize which gallium auxiliary dirs, driver driver, winsys dirs get built from the config/* files.
Diffstat (limited to 'configs')
-rw-r--r--configs/default12
-rw-r--r--configs/linux-cell3
-rw-r--r--configs/linux-dri6
-rw-r--r--configs/linux-llvm2
4 files changed, 17 insertions, 6 deletions
diff --git a/configs/default b/configs/default
index 25a87e66a1..7f659725cb 100644
--- a/configs/default
+++ b/configs/default
@@ -60,13 +60,21 @@ GLW_SOURCES = GLwDrawA.c
# Directories to build
LIB_DIR = lib
-SRC_DIRS = gallium mesa glu glut/glx glw
+SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glw
GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
+DRIVER_DIRS =
# Which subdirs under $(TOP)/progs/ to enter:
PROGRAM_DIRS = demos redbook samples glsl xdemos
+# Gallium directories and
+GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi util
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+GALLIUM_WINSYS_DIRS = xlib
+
+
# Library/program dependencies
#EXTRA_LIB_PATH ?=
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
diff --git a/configs/linux-cell b/configs/linux-cell
index 09f62fc1ff..807ede75a7 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -5,6 +5,9 @@ include $(TOP)/configs/default
CONFIG_NAME = linux-cell
+GALLIUM_DRIVER_DIRS += cell
+
+
# Compiler and flags
CC = ppu32-gcc
CXX = ppu32-g++
diff --git a/configs/linux-dri b/configs/linux-dri
index e6135856fc..68afcb1d28 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -54,15 +54,13 @@ USING_EGL=0
# Directories
ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS := egl $(SRC_DIRS)
PROGRAM_DIRS = egl
-else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS =
endif
DRIVER_DIRS = dri
WINDOW_SYSTEM=dri
+GALLIUM_WINSYS_DIRS = dri
# gamma are missing because they have not been converted to use the new
# interface.
diff --git a/configs/linux-llvm b/configs/linux-llvm
index 915189f462..a8889321a0 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -5,6 +5,8 @@ include $(TOP)/configs/linux
CONFIG_NAME = linux-llvm
+GALLIUM_AUXILIARY_DIRS += llvm
+
OPT_FLAGS = -g -ansi -pedantic
DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1