summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-02-09 10:17:58 -0700
committerBrian Paul <brianp@vmware.com>2009-02-09 10:17:58 -0700
commitabbe96cb6e7581a52652030e40442b943a482840 (patch)
treee61a7e495e7990dc1a3e3fe497ae2f0f520debf1 /configs
parent3c15e02783ed5e908d7668c39786337d62e51d12 (diff)
downloadexternal_mesa3d-abbe96cb6e7581a52652030e40442b943a482840.zip
external_mesa3d-abbe96cb6e7581a52652030e40442b943a482840.tar.gz
external_mesa3d-abbe96cb6e7581a52652030e40442b943a482840.tar.bz2
mesa: added new linux-gallium and linux-gallium-debug configs
Also, remove gallium-related things from configs/default. They're in linux-gallium now. So the default builds are the same as they have been for Mesa/master.
Diffstat (limited to 'configs')
-rw-r--r--configs/default12
-rw-r--r--configs/linux-gallium22
-rw-r--r--configs/linux-gallium-debug8
3 files changed, 32 insertions, 10 deletions
diff --git a/configs/default b/configs/default
index 13bda58..ec8d51c 100644
--- a/configs/default
+++ b/configs/default
@@ -79,24 +79,16 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
# Directories to build
LIB_DIR = lib
-SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
+SRC_DIRS = mesa egl glu glut/glx glew glw
GLU_DIRS = sgi
-DRIVER_DIRS =
+DRIVER_DIRS = x11 osmesa
# 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)
diff --git a/configs/linux-gallium b/configs/linux-gallium
new file mode 100644
index 0000000..b046f24
--- /dev/null
+++ b/configs/linux-gallium
@@ -0,0 +1,22 @@
+# Configuration for Linux / Gallium
+
+include $(TOP)/configs/linux
+
+CONFIG_NAME = linux-gallium
+
+
+# Directories to build (adds gallium to SRC_DIRS)
+SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
+
+
+# don't build old/conventional Mesa drivers
+DRIVER_DIRS =
+
+
+# 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
+
diff --git a/configs/linux-gallium-debug b/configs/linux-gallium-debug
new file mode 100644
index 0000000..111c43b
--- /dev/null
+++ b/configs/linux-gallium-debug
@@ -0,0 +1,8 @@
+# Configuration for Linux / Gallium for debug
+
+include $(TOP)/configs/linux-gallium
+
+CONFIG_NAME = linux-gallium-debug
+
+OPT_FLAGS = -g -ansi -pedantic
+DEFINES += -DDEBUG -DDEBUG_MATH