From f1854116375350e3eb43ed04f06f5ac3f1c44712 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 20 Jun 2007 23:05:23 +0100
Subject: Only build i915tex

---
 configs/linux-dri | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 5f945a73f1..4af8c25f66 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,5 +66,4 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = i810 i915tex i915 i965 mach64 mga r128 r200 r300 radeon s3v \
-	savage sis tdfx trident unichrome ffb
+DRI_DIRS = i915tex 
-- 
cgit v1.2.3


From b4c18efcd0107f62681f06ca0eb26fe8af76ede5 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 31 Jul 2007 20:22:49 +0100
Subject: Build the "pipe" version of the i915tex driver.

This hands all rendering off to the softpipe rasterizer.
---
 configs/linux-dri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 4af8c25f66..6a29505a6b 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = i915tex 
+DRI_DIRS = i915pipe 
-- 
cgit v1.2.3


From 8a475cb791a0e66fcdc3fcd12c517fcb98d75957 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 8 Aug 2007 09:41:52 +0100
Subject: Rename drivers/dri/i915pipe --> drivers/dri/intel_winsys.

This is appropriate as this is not a "pipe driver for the i915" as the
old name would suggest, but rather a dri driver that can provide "winsys"
backends to softpipe/i915/i965/etc pipe drivers, running under the
intel DDX, drm, etc.

It also frees up the i915pipe name for something more appropriate, ie
mesa/pipe/i915pipe.
---
 configs/linux-dri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 6a29505a6b..63e065a40f 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = i915pipe 
+DRI_DIRS = intel_winsys 
-- 
cgit v1.2.3


From 3fc926f3740da9ec27853d158243055f3cb43d43 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 16 Aug 2007 18:11:55 -0600
Subject: Remove many dependencies on mesa headers.

To build with mesa, need -DMESA in makefile/config file.
---
 configs/linux           | 3 ++-
 configs/linux-dri-debug | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux b/configs/linux
index 0d455ff46a..ed90fe4bc2 100644
--- a/configs/linux
+++ b/configs/linux
@@ -18,7 +18,8 @@ ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
+	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN \
+	-DMESA
 
 X11_INCLUDES = -I/usr/X11R6/include
 
diff --git a/configs/linux-dri-debug b/configs/linux-dri-debug
index c3a458459d..a7ce255e00 100644
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-debug
 OPT_FLAGS  = -O0 -g
-ARCH_FLAGS = -DDEBUG
+ARCH_FLAGS = -DDEBUG -DMESA
 
 # Helpful to reduce the amount of stuff that gets built sometimes:
 #DRI_DIRS = i915tex i915 
-- 
cgit v1.2.3


From a17d5361b257cb44614a926a7f994b4a46a07890 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 20 Aug 2007 17:02:27 -0600
Subject: remove the -DMESA flags

---
 configs/linux           | 3 +--
 configs/linux-dri-debug | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'configs')

diff --git a/configs/linux b/configs/linux
index ed90fe4bc2..0d455ff46a 100644
--- a/configs/linux
+++ b/configs/linux
@@ -18,8 +18,7 @@ ARCH_FLAGS ?=
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-D_BSD_SOURCE -D_GNU_SOURCE \
-	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN \
-	-DMESA
+	-DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
 
 X11_INCLUDES = -I/usr/X11R6/include
 
diff --git a/configs/linux-dri-debug b/configs/linux-dri-debug
index a7ce255e00..c3a458459d 100644
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-debug
 OPT_FLAGS  = -O0 -g
-ARCH_FLAGS = -DDEBUG -DMESA
+ARCH_FLAGS = -DDEBUG
 
 # Helpful to reduce the amount of stuff that gets built sometimes:
 #DRI_DIRS = i915tex i915 
-- 
cgit v1.2.3


From 83a674a7af4e58f677a56aae2111d2cbdbf1e21d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Wed, 19 Sep 2007 23:43:36 +0100
Subject: Update linux-profile config.

---
 configs/linux-profile | 27 +++------------------------
 configs/linux-static  |  3 ++-
 2 files changed, 5 insertions(+), 25 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-profile b/configs/linux-profile
index 75b245779a..3efdcf5e05 100644
--- a/configs/linux-profile
+++ b/configs/linux-profile
@@ -1,29 +1,8 @@
 # Configuration for profiling on Linux with gprof
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux-static
 
 CONFIG_NAME = linux-profile
 
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -pg -O -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG
-
-CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-# Need to have -L/usr/X11R6/lib in these:
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-
-# Need to make static libs for profiling:
-MKLIB_OPTIONS = -static
-GL_LIB_NAME = lib$(GL_LIB).a
-GLU_LIB_NAME = lib$(GLU_LIB).a
-GLUT_LIB_NAME = lib$(GLUT_LIB).a
-GLW_LIB_NAME = lib$(GLW_LIB).a
-OSMESA_LIB_NAME = lib$(OSMesa).a
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
+OPT_FLAGS = -pg -g -O2 -DNDEBUG
+DEFINES += -DNDEBUG
diff --git a/configs/linux-static b/configs/linux-static
index 85141ea643..d5fbe9cf65 100644
--- a/configs/linux-static
+++ b/configs/linux-static
@@ -21,6 +21,7 @@ GLUT_LIB_DEPS =
 GLW_LIB_DEPS = 
 
 # Need to specify all libraries we may need
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm \
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
+	-l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group -lm \
 	-L/usr/X11R6/lib/ -lX11 -lXmu -lXi -lpthread
 
-- 
cgit v1.2.3


From 59424e2d34b791100d7924069df261b8147c3bff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@titan.(none)>
Date: Fri, 28 Sep 2007 17:17:11 +0000
Subject: Update x86's static and profile configs.

---
 configs/linux-profile        | 2 +-
 configs/linux-x86-64-profile | 8 ++++++++
 configs/linux-x86-64-static  | 5 ++++-
 configs/linux-x86-profile    | 8 ++++++++
 configs/linux-x86-static     | 5 ++++-
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 configs/linux-x86-64-profile
 create mode 100644 configs/linux-x86-profile

(limited to 'configs')

diff --git a/configs/linux-profile b/configs/linux-profile
index 3efdcf5e05..e3895dd8be 100644
--- a/configs/linux-profile
+++ b/configs/linux-profile
@@ -4,5 +4,5 @@ include $(TOP)/configs/linux-static
 
 CONFIG_NAME = linux-profile
 
-OPT_FLAGS = -pg -g -O2 -DNDEBUG
+OPT_FLAGS = -pg -g -O2
 DEFINES += -DNDEBUG
diff --git a/configs/linux-x86-64-profile b/configs/linux-x86-64-profile
new file mode 100644
index 0000000000..6eb9c6844b
--- /dev/null
+++ b/configs/linux-x86-64-profile
@@ -0,0 +1,8 @@
+# Configuration for profiling on Linux for 64-bit X86 (Opteron) with gprof
+
+include $(TOP)/configs/linux-x86-64-static
+
+CONFIG_NAME = linux-x86-64-profile
+
+OPT_FLAGS = -pg -g -O2
+DEFINES += -DNDEBUG
diff --git a/configs/linux-x86-64-static b/configs/linux-x86-64-static
index 02574303a9..909965da36 100644
--- a/configs/linux-x86-64-static
+++ b/configs/linux-x86-64-static
@@ -19,5 +19,8 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+
+# Need to specify all libraries we may need
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
+               -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \
                $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
diff --git a/configs/linux-x86-profile b/configs/linux-x86-profile
new file mode 100644
index 0000000000..987b5f0cf9
--- /dev/null
+++ b/configs/linux-x86-profile
@@ -0,0 +1,8 @@
+# Configuration for profiling on Linux with x86 optimizations with gprof
+
+include $(TOP)/configs/linux-x86-static
+
+CONFIG_NAME = linux-x86-profile
+
+OPT_FLAGS = -pg -g -O2
+DEFINES += -DNDEBUG
diff --git a/configs/linux-x86-static b/configs/linux-x86-static
index 9915987da3..3b281e6685 100644
--- a/configs/linux-x86-static
+++ b/configs/linux-x86-static
@@ -19,5 +19,8 @@ OSMESA_LIB_DEPS =
 GLU_LIB_DEPS = 
 GLUT_LIB_DEPS = 
 GLW_LIB_DEPS = 
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) \
+
+# Need to specify all libraries we may need
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -Wl,--start-group \
+               -l$(GL_LIB) $(TOP)/src/mesa/pipe/softpipe/libsoftpipe.a -Wl,--end-group \
                $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lpthread -lstdc++ -lm
-- 
cgit v1.2.3


From b2e529982eb702ea039f6436c9dece39401a4c9c Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Mon, 8 Oct 2007 10:24:35 -0400
Subject: Initial stab at LLVM integration.

---
 configs/default | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index a7de3f813d..ac8de653ec 100644
--- a/configs/default
+++ b/configs/default
@@ -65,10 +65,29 @@ DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 
+LLVM_VERSION := $(shell llvm-config --version)
+
+ifeq ($(LLVM_VERSION),)
+  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
+  MESA_NO_LLVM=1
+else
+  MESA_NO_LLVM=0
+  $(info Using LLVM version: $(LLVM_VERSION))
+endif
+
+ifeq ($(MESA_NO_LLVM),0)
+  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_NO_LLVM=0 -Wno-long-long
+  LLVM_LDFLAGS=`llvm-config --ldflags`
+  LLVM_LIBS=`llvm-config --libs`
+else
+  LLVM_CFLAGS=-DMESA_NO_LLVM=1
+  LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
+endif
 
 # Library/program dependencies
 #EXTRA_LIB_PATH ?=
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-- 
cgit v1.2.3


From 2dbba8b024720c11cb2d812b5ccb61ecb9887faa Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Fri, 12 Oct 2007 13:57:53 -0400
Subject: Implement the conversion and do the initial execution pass.

---
 configs/default | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index ac8de653ec..bb8f9a1808 100644
--- a/configs/default
+++ b/configs/default
@@ -76,7 +76,8 @@ else
 endif
 
 ifeq ($(MESA_NO_LLVM),0)
-  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
+#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
+  LLVM_CFLAGS=-DMESA_NO_LLVM=0
   LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_NO_LLVM=0 -Wno-long-long
   LLVM_LDFLAGS=`llvm-config --ldflags`
   LLVM_LIBS=`llvm-config --libs`
-- 
cgit v1.2.3


From b04430efd963ca541c435c6c1007feccf5474040 Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Mon, 22 Oct 2007 11:00:28 -0400
Subject: Introduce linux-llvm target. Remove the llvm code from the default
 build for now. Cleanup some of the debugging output.

---
 configs/default    | 25 +++----------------------
 configs/linux-llvm | 31 +++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 configs/linux-llvm

(limited to 'configs')

diff --git a/configs/default b/configs/default
index bb8f9a1808..9379833a9c 100644
--- a/configs/default
+++ b/configs/default
@@ -40,6 +40,8 @@ GLUT_LIB = glut
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
 
+LLVM_CFLAGS=-DMESA_NO_LLVM=1
+LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
 
 # Library names (actual file names)
 GL_LIB_NAME = lib$(GL_LIB).so
@@ -65,30 +67,9 @@ DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 
-LLVM_VERSION := $(shell llvm-config --version)
-
-ifeq ($(LLVM_VERSION),)
-  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
-  MESA_NO_LLVM=1
-else
-  MESA_NO_LLVM=0
-  $(info Using LLVM version: $(LLVM_VERSION))
-endif
-
-ifeq ($(MESA_NO_LLVM),0)
-#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
-  LLVM_CFLAGS=-DMESA_NO_LLVM=0
-  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_NO_LLVM=0 -Wno-long-long
-  LLVM_LDFLAGS=`llvm-config --ldflags`
-  LLVM_LIBS=`llvm-config --libs`
-else
-  LLVM_CFLAGS=-DMESA_NO_LLVM=1
-  LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
-endif
-
 # Library/program dependencies
 #EXTRA_LIB_PATH ?=
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
diff --git a/configs/linux-llvm b/configs/linux-llvm
new file mode 100644
index 0000000000..addefaa511
--- /dev/null
+++ b/configs/linux-llvm
@@ -0,0 +1,31 @@
+# Configuration for debugging on Linux
+
+include $(TOP)/configs/linux
+
+CONFIG_NAME = linux-debug
+
+OPT_FLAGS = -g -ansi -pedantic
+DEFINES += -DDEBUG -DDEBUG_MATH
+
+LLVM_VERSION := $(shell llvm-config --version)
+
+ifeq ($(LLVM_VERSION),)
+  $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
+  MESA_NO_LLVM=1
+else
+  MESA_NO_LLVM=0
+  $(info Using LLVM version: $(LLVM_VERSION))
+endif
+
+ifeq ($(MESA_NO_LLVM),0)
+#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
+  LLVM_CFLAGS=-DMESA_NO_LLVM=0
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_NO_LLVM=0 -Wno-long-long
+  LLVM_LDFLAGS=`llvm-config --ldflags`
+  LLVM_LIBS=`llvm-config --libs`
+else
+  LLVM_CFLAGS=-DMESA_NO_LLVM=1
+  LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
+endif
+
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-- 
cgit v1.2.3


From d76a7b61bb2de2425289f462e07a678cf3c4ba59 Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Wed, 24 Oct 2007 08:34:01 -0400
Subject: Cleanup some code.

---
 configs/default    |  3 +--
 configs/linux-llvm | 16 ++++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 9379833a9c..a7de3f813d 100644
--- a/configs/default
+++ b/configs/default
@@ -40,8 +40,6 @@ GLUT_LIB = glut
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
 
-LLVM_CFLAGS=-DMESA_NO_LLVM=1
-LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
 
 # Library names (actual file names)
 GL_LIB_NAME = lib$(GL_LIB).so
@@ -67,6 +65,7 @@ DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 
+
 # Library/program dependencies
 #EXTRA_LIB_PATH ?=
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
diff --git a/configs/linux-llvm b/configs/linux-llvm
index addefaa511..8e9b408861 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -11,21 +11,21 @@ LLVM_VERSION := $(shell llvm-config --version)
 
 ifeq ($(LLVM_VERSION),)
   $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
-  MESA_NO_LLVM=1
+  MESA_LLVM=0
 else
-  MESA_NO_LLVM=0
+  MESA_LLVM=1
   $(info Using LLVM version: $(LLVM_VERSION))
 endif
 
-ifeq ($(MESA_NO_LLVM),0)
-#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_NO_LLVM=0
-  LLVM_CFLAGS=-DMESA_NO_LLVM=0
-  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_NO_LLVM=0 -Wno-long-long
+ifeq ($(MESA_LLVM),1)
+#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_LLVM=1
+  LLVM_CFLAGS=-DMESA_LLVM=1
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_LLVM=1 -Wno-long-long
   LLVM_LDFLAGS=`llvm-config --ldflags`
   LLVM_LIBS=`llvm-config --libs`
 else
-  LLVM_CFLAGS=-DMESA_NO_LLVM=1
-  LLVM_CXXFLAGS=-DMESA_NO_LLVM=1
+  LLVM_CFLAGS=
+  LLVM_CXXFLAGS=
 endif
 
 GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-- 
cgit v1.2.3


From 8568fadaf22787bc1652bb6f818b9c5c1ec81318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel@tungstengraphics.com>
Date: Thu, 25 Oct 2007 18:24:51 +0200
Subject: LLVM requires linking with the C++ compiler.

It's basically luck if it works with the C compiler on some platforms...
---
 configs/linux-llvm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 8e9b408861..b24959ec01 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -23,6 +23,7 @@ ifeq ($(MESA_LLVM),1)
   LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_LLVM=1 -Wno-long-long
   LLVM_LDFLAGS=`llvm-config --ldflags`
   LLVM_LIBS=`llvm-config --libs`
+  MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
   LLVM_CXXFLAGS=
-- 
cgit v1.2.3


From 1d2ff452d4dd8fb7f2f5e53b360b29254fc4db41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Thu, 25 Oct 2007 15:46:40 +0100
Subject: Expand pkg-config flags before invoking the compiler.

This allows IDEs such as Eclipse to get the correct c-preprocessor flags used
from the build output.
---
 configs/linux-dri     |  4 ++--
 configs/linux-dri-xcb | 10 +++++-----
 configs/linux-solo    |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 63e065a40f..936fce9982 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -38,8 +38,8 @@ ASM_SOURCES =
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
 
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
+LIBDRM_LIB = $(shell pkg-config --libs libdrm)
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 		-lm -lpthread -ldl \
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 5620fe58e7..aa292a13ec 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -25,7 +25,7 @@ DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
 	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
         -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
 
-X11_INCLUDES = `pkg-config --cflags-only-I x11` `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`
+X11_INCLUDES = $(shell pkg-config --cflags-only-I x11) $(shell pkg-config --cflags-only-I xcb) $(shell pkg-config --cflags-only-I x11-xcb) $(shell pkg-config --cflags-only-I xcb-glx)
 
 CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 	$(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math 
@@ -36,13 +36,13 @@ CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 ASM_SOURCES = 
 
 # Library/program dependencies
-EXTRA_LIB_PATH=`pkg-config --libs-only-L x11`
+EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11)
 
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
+LIBDRM_LIB = $(shell pkg-config --libs libdrm)
 DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
 GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
-                $(LIBDRM_LIB) `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`
+                $(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)
 
 
 # This is now 0 by default since it seems to confuse the hell out of people
diff --git a/configs/linux-solo b/configs/linux-solo
index 2d0817dfb7..220fe58b9a 100644
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -16,10 +16,10 @@ PIC_FLAGS  = -fPIC
 ARCH_FLAGS ?=
 
 # DRM and pciaccess
-LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
-LIBDRM_LIB = `pkg-config --libs libdrm`
-PCIACCESS_CFLAGS = `pkg-config --cflags pciaccess`
-PCIACCESS_LIB = `pkg-config --libs pciaccess`
+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
+LIBDRM_LIB = $(shell pkg-config --libs libdrm)
+PCIACCESS_CFLAGS = $(shell pkg-config --cflags pciaccess)
+PCIACCESS_LIB = $(shell pkg-config --libs pciaccess)
 
 
 DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
-- 
cgit v1.2.3


From 233c374d02a99ecd0c2ddc6f11f305ae8783fc97 Mon Sep 17 00:00:00 2001
From: Brian <brian@ps3.localnet.net>
Date: Sun, 2 Dec 2007 15:20:13 -0700
Subject: glut doesn't need -lXt

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index a7de3f813d..92fc743ab4 100644
--- a/configs/default
+++ b/configs/default
@@ -71,7 +71,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
 GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
+GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm
 GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 
-- 
cgit v1.2.3


From 88b715b049efa81f4021d642a963b58113a875cf Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Sun, 2 Dec 2007 15:23:51 -0700
Subject: Initial Cell driver infrastructure.

No real code yet.  Just stand-ins and make/build infrastructure.
---
 configs/linux-cell | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 configs/linux-cell

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
new file mode 100644
index 0000000000..8bedca9246
--- /dev/null
+++ b/configs/linux-cell
@@ -0,0 +1,37 @@
+# linux-cell
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-cell
+
+
+# Compiler and flags
+CC = /usr/bin/ppu32-gcc
+CXX = /usr/bin/ppu32-g++
+
+# Cell SDK location
+SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
+
+
+CFLAGS = -g -W -Wall -Winline -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h
+
+CXXFLAGS = $(CFLAGS)
+
+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
+	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe
+
+
+
+### SPU stuff
+
+SPU_CC = /usr/bin/spu-gcc
+
+SPU_CFLAGS = -g -W -Wall -Winline -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
+
+SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
+
+SPU_AR = /usr/bin/ar
+SPU_AR_FLAGS = -qcs
+
+SPU_EMBED = /usr/bin/embedspu
+SPU_EMBED_FLAGS = -m32
-- 
cgit v1.2.3


From c27082995d4c17bf19c864fd1a3cf4f26bd53bf7 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Sun, 2 Dec 2007 15:34:14 -0700
Subject: don't build libglw

---
 configs/linux-cell | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 8bedca9246..151768583c 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -17,6 +17,10 @@ CFLAGS = -g -W -Wall -Winline -m32 -mabi=altivec -maltivec -I. -I/usr/include -I
 
 CXXFLAGS = $(CFLAGS)
 
+# Omitting glw here:
+SRC_DIRS = mesa glu glut/glx
+
+
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe
 
-- 
cgit v1.2.3


From 91692fce203ff993881bcf1f7cfb256a1650d1f9 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Sun, 2 Dec 2007 15:34:27 -0700
Subject: added -fPIC

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 151768583c..4a327faccc 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -13,7 +13,7 @@ CXX = /usr/bin/ppu32-g++
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = -g -W -Wall -Winline -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h
+CFLAGS = -g -W -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h
 
 CXXFLAGS = $(CFLAGS)
 
-- 
cgit v1.2.3


From 59356268187470c5fda9e9a1a7058607f938fb3b Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Wed, 5 Dec 2007 14:57:19 -0700
Subject: Add dependency checking for Cell driver sources.

---
 configs/linux-cell | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 4a327faccc..f581b5a6fe 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -21,6 +21,9 @@ CXXFLAGS = $(CFLAGS)
 SRC_DIRS = mesa glu glut/glx
 
 
+MKDEP_OPTIONS = -fdepend -Y
+
+
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe
 
-- 
cgit v1.2.3


From 36ef54deae0128e5e78e2f9257189b0168120732 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 10 Dec 2007 14:10:29 -0700
Subject: remove -Wall, add -DGALLIUM_CELL

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index f581b5a6fe..f2c1dd25e5 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -13,7 +13,7 @@ CXX = /usr/bin/ppu32-g++
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = -g -W -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h
+CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h -DGALLIUM_CELL
 
 CXXFLAGS = $(CFLAGS)
 
-- 
cgit v1.2.3


From 63a9d835ce3f446fe2cf69e7623d228bcc6ee91c Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Fri, 9 Nov 2007 10:08:15 -0500
Subject: Redo the fragment program examples to match vp's

we just load text files instead of compiling tons of small
binaries
---
 configs/linux-llvm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index b24959ec01..6d1f31daa2 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -1,8 +1,8 @@
-# Configuration for debugging on Linux
+# Configuration for Linux and LLVM with debugging info
 
 include $(TOP)/configs/linux
 
-CONFIG_NAME = linux-debug
+CONFIG_NAME = linux-llvm
 
 OPT_FLAGS = -g -ansi -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH
-- 
cgit v1.2.3


From bfb43e8e79c3b0d85c1b459c5524619c8eb33280 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Tue, 11 Dec 2007 12:39:17 -0800
Subject: Remove '-include altivec.h'.

Including altivec.h caused problems in some places that use "pixel" as a
variable name.
---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index f2c1dd25e5..46320e797c 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -13,7 +13,7 @@ CXX = /usr/bin/ppu32-g++
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h -DGALLIUM_CELL
+CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -DGALLIUM_CELL
 
 CXXFLAGS = $(CFLAGS)
 
-- 
cgit v1.2.3


From 9a0fe23d493dc9307d76f0a35cbe4f410ee3df28 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Tue, 11 Dec 2007 12:40:58 -0800
Subject: Port to libspe2

libspe is deprecated in Cell SDK 2.1, and it is removed in Cell SDK 3.0.
This patch ports the existing libspe-based code to libspe2.  Some error
checking (eh-hem) would be nice.
---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 46320e797c..3ac49b3659 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -25,7 +25,7 @@ MKDEP_OPTIONS = -fdepend -Y
 
 
 GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
-	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe
+	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe2
 
 
 
-- 
cgit v1.2.3


From 1613c49c9859f55dfb5bea23c46a3be54b246a9b Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 3 Jan 2008 09:57:12 -0700
Subject: Cell: added -Wmissing-prototypes to SPU_CFLAGS

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 3ac49b3659..2551530f31 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -33,7 +33,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 
 SPU_CC = /usr/bin/spu-gcc
 
-SPU_CFLAGS = -g -W -Wall -Winline -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
+SPU_CFLAGS = -g -W -Wall -Winline -Wmissing-prototypes -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
 
 SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
 
-- 
cgit v1.2.3


From 9789c301b476b1127f847144fd5c8313e6ba8be8 Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Fri, 4 Jan 2008 09:27:42 -0500
Subject: llvm: we need custom rules so had to redo the build a little bit

also don't use sse when llvm is enabled
---
 configs/linux-llvm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 6d1f31daa2..915189f462 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -1,3 +1,4 @@
+# -*-makefile-*-
 # Configuration for Linux and LLVM with debugging info
 
 include $(TOP)/configs/linux
@@ -5,7 +6,7 @@ include $(TOP)/configs/linux
 CONFIG_NAME = linux-llvm
 
 OPT_FLAGS = -g -ansi -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH
+DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
 
 LLVM_VERSION := $(shell llvm-config --version)
 
@@ -18,9 +19,8 @@ else
 endif
 
 ifeq ($(MESA_LLVM),1)
-#  LLVM_CFLAGS=`llvm-config --cflags` -DMESA_LLVM=1
-  LLVM_CFLAGS=-DMESA_LLVM=1
-  LLVM_CXXFLAGS=`llvm-config --cxxflags` -DMESA_LLVM=1 -Wno-long-long
+#  LLVM_CFLAGS=`llvm-config --cflags`
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
   LLVM_LDFLAGS=`llvm-config --ldflags`
   LLVM_LIBS=`llvm-config --libs`
   MKLIB_OPTIONS=-cplusplus
-- 
cgit v1.2.3


From eb4a7382dc7ef425d6cb7e176026cc07f6105e1e Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 3 Jan 2008 14:57:07 -0800
Subject: Remove unnecessary paths

Removing the paths on certain commands (e.g., ppu32-gcc) and removing
-I/usr/include makes it possible to build for Cell on both PowerPC and
x86 hosts.
---
 configs/linux-cell | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 2551530f31..02bf61c6b4 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -6,14 +6,14 @@ CONFIG_NAME = linux-cell
 
 
 # Compiler and flags
-CC = /usr/bin/ppu32-gcc
-CXX = /usr/bin/ppu32-g++
+CC = ppu32-gcc
+CXX = ppu32-g++
 
 # Cell SDK location
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -DGALLIUM_CELL
+CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
 
 CXXFLAGS = $(CFLAGS)
 
@@ -31,14 +31,14 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 
 ### SPU stuff
 
-SPU_CC = /usr/bin/spu-gcc
+SPU_CC = spu-gcc
 
 SPU_CFLAGS = -g -W -Wall -Winline -Wmissing-prototypes -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
 
 SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
 
-SPU_AR = /usr/bin/ar
+SPU_AR = ppu-ar
 SPU_AR_FLAGS = -qcs
 
-SPU_EMBED = /usr/bin/embedspu
+SPU_EMBED = ppu32-embedspu
 SPU_EMBED_FLAGS = -m32
-- 
cgit v1.2.3


From ffcb4d84984dde393d914e1a4af5b83488683071 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 3 Jan 2008 14:59:14 -0800
Subject: Use EXTRA_LIB_PATH with *_LIB_DEPS

Make sure EXTRA_LIB_PATH is used with all the LIB_DEPS.  Re-order some
of the options and tweak the whitespace to make the various LIB_DEPS
more readable.  This makes building for Cell on x86 a bit easier and
doesn't seem to effect other builds.
---
 configs/default | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 92fc743ab4..6ce0249a9a 100644
--- a/configs/default
+++ b/configs/default
@@ -68,12 +68,12 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 # Library/program dependencies
 #EXTRA_LIB_PATH ?=
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
+GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+GLU_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
+GLUT_LIB_DEPS   = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
+GLW_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXt -lX11
+APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 
 
 
-- 
cgit v1.2.3


From b3492a2052a8877739ddf430922ed48ae30d84da Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Thu, 3 Jan 2008 15:08:53 -0800
Subject: Use HOST_CC for programs that will run on the build host

---
 configs/default    | 1 +
 configs/linux-cell | 1 +
 2 files changed, 2 insertions(+)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 6ce0249a9a..166205a1d3 100644
--- a/configs/default
+++ b/configs/default
@@ -18,6 +18,7 @@ DRM_SOURCE_PATH=$(TOP)/../drm
 # Compiler and flags
 CC = cc
 CXX = CC
+HOST_CC = $(CC)
 CFLAGS = -O
 CXXFLAGS = -O
 GLU_CFLAGS = 
diff --git a/configs/linux-cell b/configs/linux-cell
index 02bf61c6b4..f4d8ef2145 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -8,6 +8,7 @@ CONFIG_NAME = linux-cell
 # Compiler and flags
 CC = ppu32-gcc
 CXX = ppu32-g++
+HOST_CC = gcc
 
 # Cell SDK location
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
-- 
cgit v1.2.3


From 7d0421d6cda0de49ca810cebdf9fa328c48d115f Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Thu, 24 Jan 2008 17:04:54 -0700
Subject: Cell: s/-W/-Wall/ in linux-cell

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index f4d8ef2145..4f0086cc1f 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -14,7 +14,7 @@ HOST_CC = gcc
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = -g -W -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
+CFLAGS = -g -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
 
 CXXFLAGS = $(CFLAGS)
 
-- 
cgit v1.2.3


From 59e7bfd5ac06bdae815ab5afa2fadb6d898c420d Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 28 Jan 2008 18:17:55 -0700
Subject: Cell: add OPT_FLAGS var

---
 configs/linux-cell | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 4f0086cc1f..3d874491e4 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -10,11 +10,13 @@ CC = ppu32-gcc
 CXX = ppu32-g++
 HOST_CC = gcc
 
+OPT_FLAGS = -g
+
 # Cell SDK location
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = -g -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
+CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
 
 CXXFLAGS = $(CFLAGS)
 
@@ -34,7 +36,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 
 SPU_CC = spu-gcc
 
-SPU_CFLAGS = -g -W -Wall -Winline -Wmissing-prototypes -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
+SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
 
 SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
 
-- 
cgit v1.2.3


From 6acd63a4980951727939c0dd545a0324965b3834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Fri, 15 Feb 2008 17:50:12 +0900
Subject: Code reorganization: update build.

Update the Makefiles and includes for the new paths.

Note that there hasn't been no separation of the Makefiles yet, and make is
jumping all over the place. That will be taken care shortly. But for now, make
should work. It was tested with linux and linux-dri. Linux-cell and linux-llvm
might require some minor tweaks.
---
 configs/beos                  | 2 +-
 configs/darwin                | 2 +-
 configs/darwin-x86ppc         | 2 +-
 configs/default               | 2 +-
 configs/freebsd-dri           | 2 +-
 configs/linux-cell            | 2 +-
 configs/linux-directfb        | 2 +-
 configs/linux-dri             | 6 +++---
 configs/linux-dri-xcb         | 4 ++--
 configs/linux-fbdev           | 2 +-
 configs/linux-osmesa          | 2 +-
 configs/linux-osmesa16        | 2 +-
 configs/linux-osmesa16-static | 2 +-
 configs/linux-osmesa32        | 2 +-
 configs/linux-solo            | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'configs')

diff --git a/configs/beos b/configs/beos
index f07973d0c7..2b74af739d 100644
--- a/configs/beos
+++ b/configs/beos
@@ -86,7 +86,7 @@ else
 endif
 
 # Directories
-SRC_DIRS = mesa glu glut/beos
+SRC_DIRS = gallium mesa glu glut/beos
 GLU_DIRS = sgi
 DRIVER_DIRS = beos
 PROGRAM_DIRS = beos samples redbook demos tests
diff --git a/configs/darwin b/configs/darwin
index 7826ecc605..bba7802696 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -25,5 +25,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = mesa glu glut/glx
+SRC_DIRS = gallium mesa glu glut/glx
 
diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc
index 13172327a7..ebeb25051f 100644
--- a/configs/darwin-x86ppc
+++ b/configs/darwin-x86ppc
@@ -29,5 +29,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = mesa glu glut/glx
+SRC_DIRS = gallium mesa glu glut/glx
 
diff --git a/configs/default b/configs/default
index 166205a1d3..25a87e66a1 100644
--- a/configs/default
+++ b/configs/default
@@ -60,7 +60,7 @@ GLW_SOURCES = GLwDrawA.c
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = mesa glu glut/glx glw
+SRC_DIRS = gallium mesa glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 # Which subdirs under $(TOP)/progs/ to enter:
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 402883d1de..67d253b869 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -36,7 +36,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11
 
 
 # Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
diff --git a/configs/linux-cell b/configs/linux-cell
index 3d874491e4..fdf20deeeb 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -21,7 +21,7 @@ CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(
 CXXFLAGS = $(CFLAGS)
 
 # Omitting glw here:
-SRC_DIRS = mesa glu glut/glx
+SRC_DIRS = gallium mesa glu glut/glx
 
 
 MKDEP_OPTIONS = -fdepend -Y
diff --git a/configs/linux-directfb b/configs/linux-directfb
index 09332f4808..dff27f7850 100644
--- a/configs/linux-directfb
+++ b/configs/linux-directfb
@@ -22,7 +22,7 @@ ifeq ($(HAVE_X86), yes)
 endif
 
 # Directories
-SRC_DIRS     = mesa glu glut/directfb
+SRC_DIRS     = gallium mesa glu glut/directfb
 GLU_DIRS     = sgi
 DRIVER_DIRS  = directfb
 PROGRAM_DIRS = demos directfb
diff --git a/configs/linux-dri b/configs/linux-dri
index 936fce9982..e6135856fc 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -54,10 +54,10 @@ USING_EGL=0
 
 # Directories
 ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
 PROGRAM_DIRS = egl
 else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
 PROGRAM_DIRS =
 endif
 
@@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel_winsys 
+DRI_DIRS = intel 
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index aa292a13ec..ea4bdf1864 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -53,10 +53,10 @@ USING_EGL=0
 
 # Directories
 ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
 PROGRAM_DIRS = egl
 else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
 PROGRAM_DIRS =
 endif
 
diff --git a/configs/linux-fbdev b/configs/linux-fbdev
index e36d20a702..1ddccb3f52 100644
--- a/configs/linux-fbdev
+++ b/configs/linux-fbdev
@@ -6,7 +6,7 @@ CONFIG_NAME = linux-fbdev
 
 CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS -DUSE_GLFBDEV_DRIVER
 
-SRC_DIRS = mesa glu glut/fbdev
+SRC_DIRS = gallium mesa glu glut/fbdev
 DRIVER_DIRS = fbdev osmesa
 PROGRAM_DIRS = fbdev demos redbook samples
 
diff --git a/configs/linux-osmesa b/configs/linux-osmesa
index cc1fbbd109..0382a19553 100644
--- a/configs/linux-osmesa
+++ b/configs/linux-osmesa
@@ -14,7 +14,7 @@ CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOUR
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = osdemos
 
diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16
index 1fb0186d31..9a527592f1 100644
--- a/configs/linux-osmesa16
+++ b/configs/linux-osmesa16
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa16.so
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 
diff --git a/configs/linux-osmesa16-static b/configs/linux-osmesa16-static
index 6645504478..1e6380b02e 100644
--- a/configs/linux-osmesa16-static
+++ b/configs/linux-osmesa16-static
@@ -18,7 +18,7 @@ OSMESA_LIB_NAME = libOSMesa16.a
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 
diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32
index a1e5a358d6..f0ef1831b0 100644
--- a/configs/linux-osmesa32
+++ b/configs/linux-osmesa32
@@ -17,7 +17,7 @@ OSMESA_LIB_NAME = libOSMesa32.so
 
 
 # Directories
-SRC_DIRS = mesa glu
+SRC_DIRS = gallium mesa glu
 DRIVER_DIRS = osmesa
 PROGRAM_DIRS = 
 
diff --git a/configs/linux-solo b/configs/linux-solo
index 220fe58b9a..d49b972228 100644
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -43,7 +43,7 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 
 # Directories
-SRC_DIRS = glx/mini mesa glu glut/mini
+SRC_DIRS = glx/mini gallium mesa glu glut/mini
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 
-- 
cgit v1.2.3


From eb3f7aa6f8615a2788714e1535d87b4814ebdda3 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 15 Feb 2008 10:33:12 -0800
Subject: Cell: Add INCLUDE_DIRS to SPU_CFLAGS to fix build.

---
 configs/linux-cell | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index fdf20deeeb..fbd6c36a09 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -36,7 +36,9 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 
 SPU_CC = spu-gcc
 
-SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main -I. -I $(SDK)/spu/include -include spu_intrinsics.h -I $(TOP)/src/mesa/
+SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main
+	-I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \
+	-include spu_intrinsics.h
 
 SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
 
-- 
cgit v1.2.3


From 71071b7a9e8e9cdd3ef9648e70bde04507516765 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Fri, 15 Feb 2008 10:36:48 -0800
Subject: Cell: Add missing back-slash in linux-cell config file

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index fbd6c36a09..09f62fc1ff 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -36,7 +36,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 
 SPU_CC = spu-gcc
 
-SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main
+SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \
 	-I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \
 	-include spu_intrinsics.h
 
-- 
cgit v1.2.3


From bfd5916eafb9a97ad10f1d4a8738e7dcb02e04f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Mon, 18 Feb 2008 14:25:04 +0900
Subject: 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.
---
 configs/default    | 12 ++++++++++--
 configs/linux-cell |  3 +++
 configs/linux-dri  |  6 ++----
 configs/linux-llvm |  2 ++
 4 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'configs')

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
 
-- 
cgit v1.2.3


From 1f2d011786784479717f8f3bef03ed3dd1ed90ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Mon, 18 Feb 2008 15:45:29 +0900
Subject: Build glx/x11.

---
 configs/linux-dri | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 68afcb1d28..c45b600013 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -53,6 +53,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 USING_EGL=0
 
 # Directories
+SRC_DIRS := glx/x11 $(SRC_DIRS)
 ifeq ($(USING_EGL), 1)
 SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
-- 
cgit v1.2.3


From 0448dbd64a2ef217349f4ada4777d432bc82e46d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Mon, 18 Feb 2008 12:33:34 +0000
Subject: Update for llvm -> gallivm rename.

---
 configs/linux-llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index a8889321a0..44e200e856 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -5,7 +5,7 @@ include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-llvm
 
-GALLIUM_AUXILIARY_DIRS += llvm
+GALLIUM_AUXILIARY_DIRS += gallivm
 
 OPT_FLAGS = -g -ansi -pedantic
 DEFINES += -DDEBUG -DDEBUG_MATH -DMESA_LLVM=1
-- 
cgit v1.2.3


From df8ab3140ce05599e1dc983ac211a30fc845d9b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Tue, 19 Feb 2008 11:49:48 +0900
Subject: Bring rtasm from mesa to gallium.

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 7f659725cb..c9be5ec3e3 100644
--- a/configs/default
+++ b/configs/default
@@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi util
+GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm 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)
-- 
cgit v1.2.3


From 90b2beb661f630966788a6e909dc759c99e38973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Tue, 19 Feb 2008 13:27:13 +0900
Subject: Simplify makefile boilerplate code.

Don't define ASM_SOURCES variable globally -- reserve that variable to be defined
locally by makefiles, together with C_SOURCES and CPP_SOURCES.
---
 configs/beos              | 4 ++--
 configs/default           | 2 +-
 configs/freebsd-dri       | 2 +-
 configs/freebsd-dri-amd64 | 4 ++--
 configs/freebsd-dri-x86   | 4 ++--
 configs/linux-directfb    | 4 ++--
 configs/linux-dri         | 2 +-
 configs/linux-dri-ppc     | 2 +-
 configs/linux-dri-x86     | 4 ++--
 configs/linux-dri-x86-64  | 4 ++--
 configs/linux-dri-xcb     | 2 +-
 configs/linux-icc         | 4 ++--
 configs/linux-icc-static  | 4 ++--
 configs/linux-indirect    | 2 +-
 configs/linux-solo        | 2 +-
 configs/linux-solo-x86    | 4 ++--
 configs/linux-sparc       | 4 ++--
 configs/linux-x86         | 4 ++--
 configs/linux-x86-64      | 4 ++--
 configs/linux-x86-glide   | 4 ++--
 configs/sunos5-gcc        | 4 ++--
 21 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'configs')

diff --git a/configs/beos b/configs/beos
index 2b74af739d..c6e972789a 100644
--- a/configs/beos
+++ b/configs/beos
@@ -26,8 +26,8 @@ ifeq ($(CPU), x86)
 		-DUSE_3DNOW_ASM \
 		-DUSE_SSE_ASM
 	
-	ASM_SOURCES = $(X86_SOURCES)
-	ASM_API = $(X86_API)
+	MESA_ASM_SOURCES = $(X86_SOURCES)
+	GLAPI_ASM_SOURCES = $(X86_API)
 
 	CC = gcc
 	CXX = g++
diff --git a/configs/default b/configs/default
index c9be5ec3e3..48ddd29282 100644
--- a/configs/default
+++ b/configs/default
@@ -51,7 +51,7 @@ OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
 
 
 # Optional assembly language optimization files for libGL
-ASM_SOURCES = 
+MESA_ASM_SOURCES = 
 
 # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
 # order to build the Motif widget too)
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 67d253b869..6fc1abbc80 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -22,7 +22,7 @@ CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -
 
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES) 
 
-ASM_SOURCES = 
+MESA_ASM_SOURCES = 
 
 # Library/program dependencies
 LIBDRM_CFLAGS = `pkg-config --cflags libdrm`
diff --git a/configs/freebsd-dri-amd64 b/configs/freebsd-dri-amd64
index 39341b9701..bb6c361398 100644
--- a/configs/freebsd-dri-amd64
+++ b/configs/freebsd-dri-amd64
@@ -6,5 +6,5 @@ include $(TOP)/configs/freebsd-dri
 CONFIG_NAME = freebsd-dri-x86-64
 
 ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES)
-ASM_API = $(X86-64_API)
+MESA_ASM_SOURCES = $(X86-64_SOURCES)
+GLAPI_ASM_SOURCES = $(X86-64_API)
diff --git a/configs/freebsd-dri-x86 b/configs/freebsd-dri-x86
index af0d27ff47..9475437fc5 100644
--- a/configs/freebsd-dri-x86
+++ b/configs/freebsd-dri-x86
@@ -9,5 +9,5 @@ CONFIG_NAME = freebsd-dri-x86
 PIC_FLAGS = 
 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/configs/linux-directfb b/configs/linux-directfb
index dff27f7850..2ed94fe275 100644
--- a/configs/linux-directfb
+++ b/configs/linux-directfb
@@ -17,8 +17,8 @@ HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
 ifeq ($(HAVE_X86), yes)
      CFLAGS   += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
      CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-     ASM_SOURCES = $(X86_SOURCES)
-     ASM_API = $(X86_API)
+     MESA_ASM_SOURCES = $(X86_SOURCES)
+     GLAPI_ASM_SOURCES = $(X86_API)
 endif
 
 # Directories
diff --git a/configs/linux-dri b/configs/linux-dri
index c45b600013..67e60cbd4c 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -33,7 +33,7 @@ CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
 
-ASM_SOURCES = 
+MESA_ASM_SOURCES = 
 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
diff --git a/configs/linux-dri-ppc b/configs/linux-dri-ppc
index fb87688065..a3a3ca83cb 100644
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -9,7 +9,7 @@ OPT_FLAGS = -Os -mcpu=603
 PIC_FLAGS = -fPIC
 
 ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
-ASM_SOURCES = $(PPC_SOURCES)
+MESA_ASM_SOURCES = $(PPC_SOURCES)
 
 # Build only the drivers for cards that exist on PowerPC.  At some point MGA
 # will be added, but not yet.
diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index b196004e58..ec8242dd68 100644
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -12,6 +12,6 @@ PIC_FLAGS =
 ARCH_FLAGS = -m32
 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
 
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index 821ab3e336..bb56de375a 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -8,8 +8,8 @@ CONFIG_NAME = linux-dri-x86-64
 ARCH_FLAGS = -m64
 
 ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES)
-ASM_API = $(X86-64_API)
+MESA_ASM_SOURCES = $(X86-64_SOURCES)
+GLAPI_ASM_SOURCES = $(X86-64_API)
 
 LIB_DIR = lib64
 
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index ea4bdf1864..fbf9b9b268 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -33,7 +33,7 @@ CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
 CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
 
-ASM_SOURCES = 
+MESA_ASM_SOURCES = 
 
 # Library/program dependencies
 EXTRA_LIB_PATH=$(shell pkg-config --libs-only-L x11)
diff --git a/configs/linux-icc b/configs/linux-icc
index 978a45af70..d90a1dab3d 100644
--- a/configs/linux-icc
+++ b/configs/linux-icc
@@ -16,7 +16,7 @@ GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
 GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
 
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
 
 
diff --git a/configs/linux-icc-static b/configs/linux-icc-static
index 0c957568c2..384db3bfe4 100644
--- a/configs/linux-icc-static
+++ b/configs/linux-icc-static
@@ -23,5 +23,5 @@ GL_LIB_DEPS =
 GLUT_LIB_DEPS =
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm -lpthread -lcxa -lunwind
 
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/configs/linux-indirect b/configs/linux-indirect
index bd33345ed7..0c4805ea87 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -34,7 +34,7 @@ CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
 
-ASM_SOURCES = 
+MESA_ASM_SOURCES = 
 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib
diff --git a/configs/linux-solo b/configs/linux-solo
index d49b972228..3145e12775 100644
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -33,7 +33,7 @@ CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
 CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
 
 
-ASM_SOURCES = 
+MESA_ASM_SOURCES = 
 
 # Library/program dependencies
 DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(TOP)/$(LIB_DIR) $(PCIACCESS_LIB)
diff --git a/configs/linux-solo-x86 b/configs/linux-solo-x86
index 13cab37658..5f5aa09c82 100644
--- a/configs/linux-solo-x86
+++ b/configs/linux-solo-x86
@@ -9,5 +9,5 @@ CONFIG_NAME = linux-solo-x86
 PIC_FLAGS = 
 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/configs/linux-sparc b/configs/linux-sparc
index 9925afc19b..346d438c28 100644
--- a/configs/linux-sparc
+++ b/configs/linux-sparc
@@ -5,5 +5,5 @@ include $(TOP)/configs/linux
 CONFIG_NAME = linux-sparc
 
 #ASM_FLAGS = -DUSE_SPARC_ASM
-#ASM_SOURCES = $(SPARC_SOURCES)
-#ASM_API = $(SPARC_API)
+#MESA_ASM_SOURCES = $(SPARC_SOURCES)
+#GLAPI_ASM_SOURCES = $(SPARC_API)
diff --git a/configs/linux-x86 b/configs/linux-x86
index 18fa06101d..a4cf4e8d62 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -5,5 +5,5 @@ include $(TOP)/configs/linux
 CONFIG_NAME = linux-x86
 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/configs/linux-x86-64 b/configs/linux-x86-64
index 67c0391836..c2441e09d0 100644
--- a/configs/linux-x86-64
+++ b/configs/linux-x86-64
@@ -6,8 +6,8 @@ CONFIG_NAME = linux-x86-64
 
 ARCH_FLAGS = -m64
 
-ASM_SOURCES = $(X86-64_SOURCES)
-ASM_API = $(X86-64_API)
+MESA_ASM_SOURCES = $(X86-64_SOURCES)
+GLAPI_ASM_SOURCES = $(X86-64_API)
 ASM_FLAGS = -DUSE_X86_64_ASM
 
 LIB_DIR = lib64
diff --git a/configs/linux-x86-glide b/configs/linux-x86-glide
index f2f8aeea60..b963fbdc66 100644
--- a/configs/linux-x86-glide
+++ b/configs/linux-x86-glide
@@ -15,8 +15,8 @@ CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199
 GLUT_CFLAGS = -fexceptions
 
 
-ASM_SOURCES = $(X86_SOURCES)
-ASM_API = $(X86_API)
+MESA_ASM_SOURCES = $(X86_SOURCES)
+GLAPI_ASM_SOURCES = $(X86_API)
 
 # Library/program dependencies
 GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
diff --git a/configs/sunos5-gcc b/configs/sunos5-gcc
index 77b293c545..3fa13d0496 100644
--- a/configs/sunos5-gcc
+++ b/configs/sunos5-gcc
@@ -16,8 +16,8 @@ ARCH_FLAGS ?=
 
 DEFINES = -D_REENTRANT -DUSE_XSHM
 
-ASM_SOURCES = $(SPARC_SOURCES)
-ASM_API = $(SPARC_API)
+MESA_ASM_SOURCES = $(SPARC_SOURCES)
+GLAPI_ASM_SOURCES = $(SPARC_API)
 ASM_FLAGS = -DUSE_SPARC_ASM
 
 CFLAGS   = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
-- 
cgit v1.2.3


From d11993100289c1597dcfc1cfa36cee3cd7eff103 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Tue, 19 Feb 2008 09:43:47 -0800
Subject: Cell: Add missing "gallium/winsys" to SRC_DIRS to fix build.

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 807ede75a7..bcf5f00acb 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -24,7 +24,7 @@ CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(
 CXXFLAGS = $(CFLAGS)
 
 # Omitting glw here:
-SRC_DIRS = gallium mesa glu glut/glx
+SRC_DIRS = gallium mesa gallium/winsys glu glut/glx
 
 
 MKDEP_OPTIONS = -fdepend -Y
-- 
cgit v1.2.3


From 73e0e567dea3cf4e1591acb3e894eecef812f367 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <darktama@beleth.(none)>
Date: Fri, 22 Feb 2008 12:36:48 +1100
Subject: nouveau: fix build

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 48ddd29282..af9ff6f426 100644
--- a/configs/default
+++ b/configs/default
@@ -70,7 +70,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv30 nv40 nv50 failover
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib
 
-- 
cgit v1.2.3


From 2d38d1b3005c02273abf3941df5dddc245a6b792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Mon, 25 Feb 2008 17:11:28 +0900
Subject: Remove files of unsupported build systems.

---
 configs/config.mgw | 42 ------------------------------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 configs/config.mgw

(limited to 'configs')

diff --git a/configs/config.mgw b/configs/config.mgw
deleted file mode 100644
index b961eb965c..0000000000
--- a/configs/config.mgw
+++ /dev/null
@@ -1,42 +0,0 @@
-# MinGW config include file updated for Mesa 7.0
-#
-#  Updated : by Heromyth, on 2007-7-21
-#  Email   : zxpmyth@yahoo.com.cn
-#  Bugs    : 1) All the default settings work fine. But the setting X86=1 can't work. 
-#            The others havn't been tested yet.
-#            2) The generated DLLs are *not* compatible with the ones built
-#            with the other compilers like VC8, especially for GLUT. 
-#            3) Although more tests are needed, it can be used individually!
-
-# The generated DLLs by MingW with STDCALL are not totally compatible 
-# with the ones linked by Microsoft's compilers.
-#
-# xxx_USING_STDCALL = 1          Compiling MESA with __stdcall. This is default!
-# 
-# xxx_USING_STDCALL = 0          Compiling MESA without __stdcall. I like this:)
-#  
-
-# In fact, GL_USING_STDCALL and GLUT_USING_STDCALL can be
-# different. For example:
-#
-#   GL_USING_STDCALL = 0
-#   GLUT_USING_STDCALL = 1
-# 
-# Suggested setting:
-#
-#     ALL_USING_STDCALL = 1
-#
-# That's default!
-#
-
-
-ALL_USING_STDCALL = 1
-
-
-ifeq ($(ALL_USING_STDCALL),1)
-  GL_USING_STDCALL = 1
-  GLUT_USING_STDCALL = 1
-else
-  GL_USING_STDCALL = 0
-  GLUT_USING_STDCALL = 0
-endif
-- 
cgit v1.2.3


From d5692cb349fb74e8f9d3a18f5bbd788b09b93581 Mon Sep 17 00:00:00 2001
From: Brian <brian.paul@tungstengraphics.com>
Date: Mon, 10 Mar 2008 17:21:43 -0600
Subject: gallium: new surface/context tracker (sct) module

Will be used for tracking the surfaces and textures which are bound/used by
contexts.
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 48ddd29282..f0146c50ce 100644
--- a/configs/default
+++ b/configs/default
@@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util
+GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util sct
 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)
-- 
cgit v1.2.3


From d493203045b214770473f8afeaa610542fe42c2a Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Sat, 15 Mar 2008 05:37:57 +0100
Subject: nv10.

---
 configs/default   | 2 +-
 configs/linux-dri | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 49d3737ec7..d010721a10 100644
--- a/configs/default
+++ b/configs/default
@@ -70,7 +70,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util sct
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv30 nv40 nv50 failover
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv10 nv30 nv40 nv50 failover
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib
 
diff --git a/configs/linux-dri b/configs/linux-dri
index 67e60cbd4c..bf7881937e 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -65,4 +65,4 @@ GALLIUM_WINSYS_DIRS = dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-DRI_DIRS = intel 
+DRI_DIRS = nouveau
-- 
cgit v1.2.3


From 542e3464a45b9d407b7f2a7fb8a4c5b92c769189 Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@us.ibm.com>
Date: Tue, 25 Mar 2008 18:15:34 -0700
Subject: cell: Enable MIT-SHM on Cell.

---
 configs/linux-cell | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index bcf5f00acb..a701fa73f1 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -19,7 +19,9 @@ OPT_FLAGS = -g
 SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 
 
-CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
+CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec \
+	-I. -I$(SDK)/include \
+	-DGALLIUM_CELL -DUSE_XSHM
 
 CXXFLAGS = $(CFLAGS)
 
-- 
cgit v1.2.3


From 08861688d3ca7a798345747a549597a52dcb6f98 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 15 Apr 2008 15:07:50 +0100
Subject: gallium: add translate directory

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index f0146c50ce..462e06d770 100644
--- a/configs/default
+++ b/configs/default
@@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util sct
+GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util sct translate
 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)
-- 
cgit v1.2.3


From 59ba8ea00b0d80c48678f6e22d33ca638e19be75 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 18 Apr 2008 17:33:49 +0100
Subject: gallium: reorder libs so that translate can see rtasm

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 462e06d770..04604f8006 100644
--- a/configs/default
+++ b/configs/default
@@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi rtasm util sct translate
+GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm 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)
-- 
cgit v1.2.3


From 6c78b8e97b21cc9152e75727ed879643f605ede3 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 14 May 2008 17:20:56 +0200
Subject: mesa: Made linux-dri targets build EGL

---
 configs/linux-dri | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 67e60cbd4c..225536ef28 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -54,14 +54,16 @@ USING_EGL=0
 
 # Directories
 SRC_DIRS := glx/x11 $(SRC_DIRS)
-ifeq ($(USING_EGL), 1)
+#ifeq ($(USING_EGL), 1)
 SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
-endif
+#endif
+
+
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM=dri
-GALLIUM_WINSYS_DIRS = dri
+GALLIUM_WINSYS_DIRS = dri egl_drm
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From 6f25d6d48d52063c50f773d005adcdf2a924e82d Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Thu, 22 May 2008 22:13:38 -0400
Subject: disable egl by default

---
 configs/linux-dri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 225536ef28..5221d043cf 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -63,7 +63,7 @@ PROGRAM_DIRS = egl
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM=dri
-GALLIUM_WINSYS_DIRS = dri egl_drm
+GALLIUM_WINSYS_DIRS = dri 
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From 3972961e62d5918f4ef4f0ceb3d8ee9549676a7c Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 22 May 2008 16:24:10 +0200
Subject: mesa: On second thought lets not build the driver

---
 configs/linux-dri | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 5221d043cf..bcc2b61561 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -53,17 +53,17 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 USING_EGL=0
 
 # Directories
-SRC_DIRS := glx/x11 $(SRC_DIRS)
-#ifeq ($(USING_EGL), 1)
-SRC_DIRS := egl $(SRC_DIRS)
+SRC_DIRS := glx/x11 egl $(SRC_DIRS)
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
+ifeq ($(USING_EGL), 1)
 PROGRAM_DIRS = egl
-#endif
+endif
 
 
 
 DRIVER_DIRS = dri
-WINDOW_SYSTEM=dri
-GALLIUM_WINSYS_DIRS = dri 
+WINDOW_SYSTEM = dri
+GALLIUM_WINSYS_DIRS = dri
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From 9395fb6e8d341d7a3f923b5ec03630ab656c8f2f Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 22 May 2008 16:24:51 +0200
Subject: mesa: Added linux-egl target, that only builds the i915simple driver
 and egl drivers

---
 configs/linux-egl | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 configs/linux-egl

(limited to 'configs')

diff --git a/configs/linux-egl b/configs/linux-egl
new file mode 100644
index 0000000000..e906806f4b
--- /dev/null
+++ b/configs/linux-egl
@@ -0,0 +1,65 @@
+# -*-makefile-*-
+# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
+
+include $(TOP)/configs/default
+
+CONFIG_NAME = linux-dri
+
+# Compiler and flags
+CC = gcc
+CXX = g++
+
+#MKDEP = /usr/X11R6/bin/makedepend
+#MKDEP = gcc -M
+#MKDEP_OPTIONS = -MF depend
+
+OPT_FLAGS  = -O -g
+PIC_FLAGS  = -fPIC
+
+# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
+ARCH_FLAGS ?=
+
+DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
+	-D_BSD_SOURCE -D_GNU_SOURCE \
+	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
+	-DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
+
+X11_INCLUDES = -I/usr/X11R6/include
+
+CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
+	$(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
+
+CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
+
+
+MESA_ASM_SOURCES = 
+
+# Library/program dependencies
+EXTRA_LIB_PATH=-L/usr/X11R6/lib
+
+LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm)
+LIBDRM_LIB = $(shell pkg-config --libs libdrm)
+DRI_LIB_DEPS  = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
+GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
+		-lm -lpthread -ldl \
+                $(LIBDRM_LIB)
+
+
+# This is now 0 by default since it seems to confuse the hell out of people
+# and generate a lot of extra noise on bugzilla.  If you need to build with
+# EGL, do 'make linux-dri USING_EGL=1'
+
+USING_EGL=0
+
+# Directories
+SRC_DIRS = gallium mesa gallium/winsys glu egl
+PROGRAM_DIRS = egl
+
+DRIVER_DIRS = dri
+WINDOW_SYSTEM = dri
+GALLIUM_WINSYS_DIRS = egl_drm
+
+# gamma are missing because they have not been converted to use the new
+# interface.
+DRI_DIRS = intel 
-- 
cgit v1.2.3


From 2064826bdae9be8679ec8eb3f2b6be467da0594d Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 23 May 2008 16:18:42 +0200
Subject: egl: Stoped compiling EGL completely

---
 configs/linux-dri | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index bcc2b61561..193d0a550a 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -53,9 +53,10 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 USING_EGL=0
 
 # Directories
-SRC_DIRS := glx/x11 egl $(SRC_DIRS)
+SRC_DIRS := glx/x11 $(SRC_DIRS)
 PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 ifeq ($(USING_EGL), 1)
+SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
 endif
 
-- 
cgit v1.2.3


From a22462f6ef769129ee56223f1edc2cb851505da8 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 23 May 2008 16:25:51 +0200
Subject: egl: Don't build EGL programs either

---
 configs/linux-dri | 1 -
 1 file changed, 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 193d0a550a..cd82c571c7 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -54,7 +54,6 @@ USING_EGL=0
 
 # Directories
 SRC_DIRS := glx/x11 $(SRC_DIRS)
-PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 ifeq ($(USING_EGL), 1)
 SRC_DIRS := egl $(SRC_DIRS)
 PROGRAM_DIRS = egl
-- 
cgit v1.2.3


From c218b8c6c6593f434a749bf67ad976007e6eef61 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Wed, 4 Jun 2008 09:56:00 +0100
Subject: Build with -O2

---
 configs/linux-dri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index cd82c571c7..2b30a00c2d 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -13,7 +13,7 @@ CXX = g++
 #MKDEP = gcc -M
 #MKDEP_OPTIONS = -MF depend
 
-OPT_FLAGS  = -O -g
+OPT_FLAGS  = -O2 -g
 PIC_FLAGS  = -fPIC
 
 # Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-- 
cgit v1.2.3


From e7725e136f0fa64c75813a3b138dc81a8b19400d Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 5 Jun 2008 14:12:27 -0600
Subject: egl: build libEGL and softpipe_egl.so by default

---
 configs/default | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 04604f8006..2019a53b4f 100644
--- a/configs/default
+++ b/configs/default
@@ -60,7 +60,7 @@ GLW_SOURCES = GLwDrawA.c
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glw
+SRC_DIRS = gallium mesa egl gallium/winsys glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = 
 # Which subdirs under $(TOP)/progs/ to enter:
@@ -72,7 +72,7 @@ GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm 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
+GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
 
 # Library/program dependencies
-- 
cgit v1.2.3


From b11aad2abe167716b7ff1262f5872d4d9dbb5b9c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 5 Jun 2008 14:41:28 -0600
Subject: build egl_xlib/ too (softpipe_egl.so library)

---
 configs/linux-dri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 2b30a00c2d..3df15056c2 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -63,7 +63,7 @@ endif
 
 DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = dri
+GALLIUM_WINSYS_DIRS = dri egl_xlib
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From adbdabb85ae322d5c80cadcee931e36d5c688d98 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 6 Jun 2008 14:49:02 +0200
Subject: i915: Moved pipe_buffer and i915_winsys functions to a common folder

---
 configs/default | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 2019a53b4f..b7d0d22438 100644
--- a/configs/default
+++ b/configs/default
@@ -71,6 +71,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
+GALLIUM_WINSYS_COMMON_DIRS = intel_drm
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
-- 
cgit v1.2.3


From 3d514a907045bc01ec5e2ceeb14c5620df10885d Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 6 Jun 2008 16:50:52 +0200
Subject: gallium: Only build intel_drm for linux-dri targets

---
 configs/default   | 2 +-
 configs/linux-dri | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index b7d0d22438..2776a11805 100644
--- a/configs/default
+++ b/configs/default
@@ -71,7 +71,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
-GALLIUM_WINSYS_COMMON_DIRS = intel_drm
+GALLIUM_WINSYS_COMMON_DIRS =
 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-dri b/configs/linux-dri
index 3df15056c2..bd5e90dbdd 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -64,6 +64,7 @@ endif
 DRIVER_DIRS = dri
 WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = dri egl_xlib
+GALLIUM_WINSYS_COMMON_DIRS = intel_drm
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From 80ab4c3f8c3cf9518cd40ce1dff10ab99ab20301 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Sun, 8 Jun 2008 17:29:56 +0200
Subject: mesa: Do not compile the dri drivers in mesa

---
 configs/linux-dri | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index bd5e90dbdd..9fd3721265 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -61,7 +61,7 @@ endif
 
 
 
-DRIVER_DIRS = dri
+DRIVER_DIRS =
 WINDOW_SYSTEM = dri
 GALLIUM_WINSYS_DIRS = dri egl_xlib
 GALLIUM_WINSYS_COMMON_DIRS = intel_drm
-- 
cgit v1.2.3


From 52a68dd9eb1d347aa01ce09db9375793d0d0ceaf Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Tue, 8 Jul 2008 01:06:18 +0200
Subject: nv04.

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index a8d1fe6bec..c1bc5fb01d 100644
--- a/configs/default
+++ b/configs/default
@@ -70,7 +70,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv10 nv30 nv40 nv50 failover
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
 GALLIUM_WINSYS_COMMON_DIRS =
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
-- 
cgit v1.2.3


From a452e0cbdeacdeb60d957eb2ebd2647a3d7a3770 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 10 Jul 2008 13:27:30 -0600
Subject: gallium: re-order the GALLIUM_AUXILIARY_DIRS to satisfy .a
 interdependencies

libutil.a and libtranslate.a depend on libcso_cache.a so put them in that order.
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 2776a11805..336d59e8c1 100644
--- a/configs/default
+++ b/configs/default
@@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
+GALLIUM_AUXILIARY_DIRS = draw util translate cso_cache pipebuffer tgsi sct rtasm
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
 GALLIUM_WINSYS_COMMON_DIRS =
-- 
cgit v1.2.3


From 5de823c00b484b435eb85f2f9360eb669b768a28 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 10 Jul 2008 22:39:56 +0200
Subject: gallium: Re-order the GALLIUM_AUXILIARY_DIRS to satisfy dependencies
 on util

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 336d59e8c1..ef9c5fda1e 100644
--- a/configs/default
+++ b/configs/default
@@ -68,7 +68,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw util translate cso_cache pipebuffer tgsi sct rtasm
+GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
 GALLIUM_WINSYS_COMMON_DIRS =
-- 
cgit v1.2.3


From 7986baf7cf5434c0ff8210eedd0be366ab5e8f14 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 10 Jul 2008 15:11:01 -0600
Subject: build egl subdirs

---
 configs/linux-dri | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 9fd3721265..380cd3812f 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -46,18 +46,8 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
                 $(LIBDRM_LIB)
 
 
-# This is now 0 by default since it seems to confuse the hell out of people
-# and generate a lot of extra noise on bugzilla.  If you need to build with
-# EGL, do 'make linux-dri USING_EGL=1'
-
-USING_EGL=0
-
 # Directories
-SRC_DIRS := glx/x11 $(SRC_DIRS)
-ifeq ($(USING_EGL), 1)
-SRC_DIRS := egl $(SRC_DIRS)
-PROGRAM_DIRS = egl
-endif
+SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 
 
 
-- 
cgit v1.2.3


From e59086ab91281cafcae094164bf4d8454df337ae Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Sun, 13 Jul 2008 18:04:49 +0200
Subject: EGL: Only build EGL dri based drivers under linux-dri based configs

---
 configs/default   | 2 ++
 configs/linux-dri | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index ef9c5fda1e..1b203b00d2 100644
--- a/configs/default
+++ b/configs/default
@@ -66,6 +66,8 @@ 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
diff --git a/configs/linux-dri b/configs/linux-dri
index 380cd3812f..7613d41ea1 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -50,6 +50,8 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 
 
+# EGL directories
+EGL_DRIVERS_DIRS = demo dri xdri
 
 DRIVER_DIRS =
 WINDOW_SYSTEM = dri
-- 
cgit v1.2.3


From 3eeafb7179b861ee6359c8747f4e009513d7ce7a Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun, 17 Aug 2008 19:12:54 +0100
Subject: choose sane default for dri driver location

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 1b203b00d2..2d14b8aef7 100644
--- a/configs/default
+++ b/configs/default
@@ -91,7 +91,7 @@ APP_LIB_DEPS    = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI
 
 # Installation directories (for make install)
 INSTALL_DIR = /usr/local
-DRI_DRIVER_INSTALL_DIR = /usr/X11R6/lib/modules/dri
+DRI_DRIVER_INSTALL_DIR = /usr/lib/dri
 
 # Where libGL will look for DRI hardware drivers
 DRI_DRIVER_SEARCH_DIR = $(DRI_DRIVER_INSTALL_DIR)
-- 
cgit v1.2.3


From ccf1910dd4b2a8ccd04ddbdf725b6dd3f8026eee Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Sun, 17 Aug 2008 20:17:18 +0100
Subject: consolidate intel directories.

we now have

src/gallium/winsys/drm/intel/{common,dri,egl}
---
 configs/default   | 1 -
 configs/linux-dri | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 2d14b8aef7..cd2c39c365 100644
--- a/configs/default
+++ b/configs/default
@@ -73,7 +73,6 @@ EGL_DRIVERS_DIRS = demo
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
-GALLIUM_WINSYS_COMMON_DIRS =
 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-dri b/configs/linux-dri
index 7613d41ea1..d441194b08 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -55,8 +55,7 @@ EGL_DRIVERS_DIRS = demo dri xdri
 
 DRIVER_DIRS =
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = dri egl_xlib
-GALLIUM_WINSYS_COMMON_DIRS = intel_drm
+GALLIUM_WINSYS_DIRS = drm egl_xlib
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From b5ab3b7dfc42a568a156dec2fa043292014f98a7 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 26 Aug 2008 14:09:28 -0600
Subject: cell: use SDK 3.0 by default

---
 configs/linux-cell | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index a701fa73f1..1f02e80edb 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -16,7 +16,10 @@ HOST_CC = gcc
 OPT_FLAGS = -g
 
 # Cell SDK location
-SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
+## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below)
+#SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
+## For SDK 3.0:
+SDK = /opt/cell/sdk/usr/
 
 
 CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec \
@@ -43,6 +46,7 @@ SPU_CC = spu-gcc
 
 SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \
 	-I. -I$(SDK)/spu/include -I$(TOP)/src/mesa/ $(INCLUDE_DIRS) \
+	-DSPU_MAIN_PARAM_LONG_LONG \
 	-include spu_intrinsics.h
 
 SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
-- 
cgit v1.2.3


From ab93aa774e2fc09b5f579eb13ce94cf22796902b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 3 Sep 2008 09:08:19 -0600
Subject: Cell: added linux-cell-debug config

linux-cell is now the optimized configuration.
Remove some Cell-specific stuff from winsys/xlib/Makefile.
---
 configs/linux-cell       |  6 ++++--
 configs/linux-cell-debug | 10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 configs/linux-cell-debug

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 1f02e80edb..cdaa17c663 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -1,4 +1,4 @@
-# linux-cell
+# linux-cell  (non-debug build)
 
 include $(TOP)/configs/default
 
@@ -13,7 +13,7 @@ CC = ppu32-gcc
 CXX = ppu32-g++
 HOST_CC = gcc
 
-OPT_FLAGS = -g
+OPT_FLAGS = -O3
 
 # Cell SDK location
 ## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below)
@@ -39,6 +39,8 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \
 	-L$(SDK)/lib -m32 -Wl,-m,elf32ppc -R$(SDK)/lib -lspe2
 
 
+CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
+
 
 ### SPU stuff
 
diff --git a/configs/linux-cell-debug b/configs/linux-cell-debug
new file mode 100644
index 0000000000..ba333bba68
--- /dev/null
+++ b/configs/linux-cell-debug
@@ -0,0 +1,10 @@
+# linux-cell-debug
+
+include $(TOP)/configs/linux-cell
+
+# just override name and OPT_FLAGS here:
+
+CONFIG_NAME = linux-cell-debug
+
+OPT_FLAGS = -g
+
-- 
cgit v1.2.3


From fafc36920eb79ddbe7049f6bbce18bcc279982d0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 3 Sep 2008 09:31:36 -0600
Subject: cell: add -DDEBUG flag, fixes to Cell Makefiles

---
 configs/linux-cell-debug | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell-debug b/configs/linux-cell-debug
index ba333bba68..42f3245edc 100644
--- a/configs/linux-cell-debug
+++ b/configs/linux-cell-debug
@@ -6,5 +6,5 @@ include $(TOP)/configs/linux-cell
 
 CONFIG_NAME = linux-cell-debug
 
-OPT_FLAGS = -g
+OPT_FLAGS = -g -DDEBUG
 
-- 
cgit v1.2.3


From 90c93bbeeec1a8ca75b68004afc5d8cb689860bc Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Thu, 11 Sep 2008 11:00:54 -0600
Subject: define new APP_CC configuration variable for building
 apps/demos/tests

For Cell, need to use different compilers for the libraries vs. the demos/tests
to avoid strange link error regarding "_Unwind_GetIPInfo@GCC_4.2.0"
---
 configs/default    | 4 ++++
 configs/linux-cell | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index cd2c39c365..94582d8274 100644
--- a/configs/default
+++ b/configs/default
@@ -23,6 +23,10 @@ CFLAGS = -O
 CXXFLAGS = -O
 GLU_CFLAGS = 
 
+# Compiler for building demos/tests/etc
+APP_CC = $(CC)
+APP_CXX = $(CXX)
+
 # Misc tools and flags
 MKLIB_OPTIONS = 
 MKDEP = makedepend
diff --git a/configs/linux-cell b/configs/linux-cell
index cdaa17c663..86651b83d7 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -12,6 +12,8 @@ GALLIUM_DRIVER_DIRS += cell
 CC = ppu32-gcc
 CXX = ppu32-g++
 HOST_CC = gcc
+APP_CC = gcc
+APP_CXX = g++
 
 OPT_FLAGS = -O3
 
@@ -19,7 +21,7 @@ OPT_FLAGS = -O3
 ## For SDK 2.1: (plus, remove -DSPU_MAIN_PARAM_LONG_LONG below)
 #SDK = /opt/ibm/cell-sdk/prototype/sysroot/usr
 ## For SDK 3.0:
-SDK = /opt/cell/sdk/usr/
+SDK = /opt/cell/sdk/usr
 
 
 CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec \
-- 
cgit v1.2.3


From cdd97ceca0ce3e69d08ae33289ca8e4075885f0b Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 11 Sep 2008 18:06:05 +0100
Subject: add gallium dir winsys/common -> winsys/

---
 configs/linux-dri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index ac940c0f07..eb6f307dac 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -56,10 +56,10 @@ SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 
 # Directories
 ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
 PROGRAM_DIRS = egl xdemos
 else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
 PROGRAM_DIRS = xdemos
 endif
 
-- 
cgit v1.2.3


From f7d7a212cdb026fd6c22b9236a2583d348b0c160 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Fri, 12 Sep 2008 12:24:21 +0100
Subject: mesa: build gallium directories before core mesa

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 2b0eb196d9..5fd4c26d37 100644
--- a/configs/default
+++ b/configs/default
@@ -77,7 +77,7 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = gallium mesa egl gallium/winsys glu glut/glx glw
+SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glw
 GLU_DIRS = sgi
 DRIVER_DIRS = 
 # Which subdirs under $(TOP)/progs/ to enter:
-- 
cgit v1.2.3


From 23e325e55a24a94cbbeea1592d07f1a09a844de7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jrfonseca@tungstengraphics.com>
Date: Wed, 1 Oct 2008 10:25:41 +0900
Subject: Add -msse and -msse2 to the *-x86 configs.

---
 configs/linux-dri-x86 | 3 +--
 configs/linux-x86     | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri-x86 b/configs/linux-dri-x86
index 4eedfa52f7..4e7d45d35a 100644
--- a/configs/linux-dri-x86
+++ b/configs/linux-dri-x86
@@ -5,8 +5,7 @@ include $(TOP)/configs/linux-dri
 
 CONFIG_NAME = linux-dri-x86
 
-# Add -m32 to CFLAGS:
-ARCH_FLAGS = -m32
+ARCH_FLAGS = -m32 -mmmx -msse -msse2
 
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 MESA_ASM_SOURCES = $(X86_SOURCES)
diff --git a/configs/linux-x86 b/configs/linux-x86
index a4cf4e8d62..5970b185ce 100644
--- a/configs/linux-x86
+++ b/configs/linux-x86
@@ -4,6 +4,8 @@ include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-x86
 
+ARCH_FLAGS = -m32 -mmmx -msse -msse2
+
 ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
 MESA_ASM_SOURCES = $(X86_SOURCES)
 GLAPI_ASM_SOURCES = $(X86_API)
-- 
cgit v1.2.3


From 9859edc6060c8f4d23a91dbfabd786975e6447a2 Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Sun, 28 Sep 2008 21:45:48 +0200
Subject: Gallivm: need to link with libstdc++ for llvm.

---
 configs/linux-llvm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 44e200e856..3b32db34d8 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -31,4 +31,4 @@ else
   LLVM_CXXFLAGS=
 endif
 
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
-- 
cgit v1.2.3


From 3f4b67f5d715f53fec618ed0e48615f87ff1cfda Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Tue, 30 Sep 2008 20:50:49 +0200
Subject: Gallivm: port to llvm 2.4.

---
 configs/linux-llvm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 3b32db34d8..489cfd0546 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -31,4 +31,5 @@ else
   LLVM_CXXFLAGS=
 endif
 
+LD = g++
 GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
-- 
cgit v1.2.3


From a4e477433f485a39b5de448d0a9cb6f4bf9bb90f Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 8 Oct 2008 20:34:35 -0600
Subject: cell: implement more built-in shader functions, link spu code with
 -lm

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 86651b83d7..8d74ee469d 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -53,7 +53,7 @@ SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -Wno-main \
 	-DSPU_MAIN_PARAM_LONG_LONG \
 	-include spu_intrinsics.h
 
-SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc
+SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -lm
 
 SPU_AR = ppu-ar
 SPU_AR_FLAGS = -qcs
-- 
cgit v1.2.3


From b50a0b89d946cac3c18a84c3a77cc8dcf96eeec7 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 16 Oct 2008 23:41:13 +0100
Subject: build "GLX" egl driver by default and egl demos

---
 configs/linux-dri | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index eb6f307dac..6a61f0c8db 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -55,20 +55,15 @@ SRC_DIRS := glx/x11 egl $(SRC_DIRS)
 
 
 # Directories
-ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw 
 PROGRAM_DIRS = egl xdemos
-else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
-PROGRAM_DIRS = xdemos
-endif
 
 # EGL directories
-EGL_DRIVERS_DIRS = demo dri xdri
+EGL_DRIVERS_DIRS = demo glx
 
 DRIVER_DIRS =
 WINDOW_SYSTEM = dri
-GALLIUM_WINSYS_DIRS = drm egl_xlib
+GALLIUM_WINSYS_DIRS = drm 
 
 # gamma are missing because they have not been converted to use the new
 # interface.
-- 
cgit v1.2.3


From 82477e485de8f18b24353bbf7e6ed03edca59edc Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 22 Oct 2008 11:13:55 -0600
Subject: cell: add -std=c99 flag to solve some warning/prototype issues

---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 8d74ee469d..f68a6853c3 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -24,7 +24,7 @@ OPT_FLAGS = -O3
 SDK = /opt/cell/sdk/usr
 
 
-CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec \
+CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -std=c99 -mabi=altivec -maltivec \
 	-I. -I$(SDK)/include \
 	-DGALLIUM_CELL -DUSE_XSHM
 
-- 
cgit v1.2.3


From 2b9b42befaf4b416e1bae423a436f4e1722a62bf Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 27 Oct 2008 18:15:56 -0600
Subject: cell: added -D_BSD_SOURCE flag

Needed to get MAP_ANONYMOUS in execmem.c and to define timezone type in glxgears.c
Adding -std=c99 earlier caused this regression.
---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index f68a6853c3..e45ea46165 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -26,7 +26,7 @@ SDK = /opt/cell/sdk/usr
 
 CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -std=c99 -mabi=altivec -maltivec \
 	-I. -I$(SDK)/include \
-	-DGALLIUM_CELL -DUSE_XSHM
+	-DGALLIUM_CELL -DUSE_XSHM -D_BSD_SOURCE
 
 CXXFLAGS = $(CFLAGS)
 
-- 
cgit v1.2.3


From 0da43322bbc6ead4eeb1b9fe079a33e0d57bece5 Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pq@iki.fi>
Date: Sat, 8 Nov 2008 18:32:33 +0200
Subject: Nouveau: build, link and use nv20.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 6c123cc3c5..7ea27b48ce 100644
--- a/configs/default
+++ b/configs/default
@@ -76,7 +76,7 @@ EGL_DRIVERS_DIRS = demo
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
-- 
cgit v1.2.3


From a35210b516eab0c0d4a5fd988e3411a98214b9ae Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 12 Nov 2008 11:01:05 -0700
Subject: cell: added -Wmissing-prototypes

---
 configs/linux-cell | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index e45ea46165..5ad37380f1 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -24,7 +24,8 @@ OPT_FLAGS = -O3
 SDK = /opt/cell/sdk/usr
 
 
-CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -std=c99 -mabi=altivec -maltivec \
+CFLAGS = $(OPT_FLAGS) -Wall -Winline -Wmissing-prototypes \
+	-fPIC -m32 -std=c99 -mabi=altivec -maltivec \
 	-I. -I$(SDK)/include \
 	-DGALLIUM_CELL -DUSE_XSHM -D_BSD_SOURCE
 
-- 
cgit v1.2.3


From 20ff08cd86df4f57026a0dcd965e75578793a90f Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pq@iki.fi>
Date: Thu, 13 Nov 2008 20:44:55 +0200
Subject: Fix configs/linux-dri to build winsys again.

SRC_DIRS was being reset, which left winsys unbuilt.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
---
 configs/linux-dri | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 6a61f0c8db..6ef4dae097 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,10 +52,6 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-
-
-# Directories
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw 
 PROGRAM_DIRS = egl xdemos
 
 # EGL directories
-- 
cgit v1.2.3


From af1ce2375e9529ad053eb9dbb228ce88d6271e87 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Thu, 13 Nov 2008 19:38:18 +0000
Subject: build default set of progs + egl

---
 configs/linux-dri | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-dri b/configs/linux-dri
index 6ef4dae097..c667a386f3 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -52,7 +52,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
 
 # Directories
 SRC_DIRS := glx/x11 egl $(SRC_DIRS)
-PROGRAM_DIRS = egl xdemos
+PROGRAM_DIRS := egl $(PROGRAM_DIRS)
 
 # EGL directories
 EGL_DRIVERS_DIRS = demo glx
@@ -70,4 +70,3 @@ GALLIUM_WINSYS_DIRS = drm
 
 #DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \
 #	savage sis tdfx trident unichrome ffb
-DRI_DIRS = intel 
-- 
cgit v1.2.3


From 4356d349ad8d048d19d795483b98103712c0103c Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 21 Nov 2008 13:57:57 -0700
Subject: cell: only build Cell and softpipe drivers

---
 configs/linux-cell | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 5ad37380f1..3322f114ba 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -5,7 +5,8 @@ include $(TOP)/configs/default
 CONFIG_NAME = linux-cell
 
 
-GALLIUM_DRIVER_DIRS += cell
+# Omiting other gallium drivers:
+GALLIUM_DRIVER_DIRS = cell softpipe
 
 
 # Compiler and flags
-- 
cgit v1.2.3


From 002dfb12fce045d0e124301e5df805df772149d8 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 8 Jan 2009 14:10:56 +0000
Subject: gallium: split driver-independent code out of xlib winsys

Place in new xlib state-tracker.  This is a statetracker for the GLX API.
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 1f340a371e..6f5f373b59 100644
--- a/configs/default
+++ b/configs/default
@@ -89,7 +89,7 @@ EGL_DRIVERS_DIRS = demo
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 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
+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
 
-- 
cgit v1.2.3


From a129c7268acc5a36852fcb006391e1f4b51ce7e1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 8 Jan 2009 08:29:42 -0700
Subject: cell: fix breakage from xlib re-org

Some of these fixes are quick band-aids for now.
---
 configs/linux-cell | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/linux-cell b/configs/linux-cell
index 3322f114ba..115604ad65 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -6,7 +6,7 @@ CONFIG_NAME = linux-cell
 
 
 # Omiting other gallium drivers:
-GALLIUM_DRIVER_DIRS = cell softpipe
+GALLIUM_DRIVER_DIRS = cell softpipe trace
 
 
 # Compiler and flags
-- 
cgit v1.2.3


From 359bbe7432babb328a313756b9d1e46e187914b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
Date: Mon, 12 Jan 2009 12:37:13 +0100
Subject: gallivm: Explicitly specify the LLVM components we need.

---
 configs/linux-llvm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'configs')

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 489cfd0546..a9d740574c 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -22,9 +22,9 @@ endif
 
 ifeq ($(MESA_LLVM),1)
 #  LLVM_CFLAGS=`llvm-config --cflags`
-  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
-  LLVM_LDFLAGS=`llvm-config --ldflags`
-  LLVM_LIBS=`llvm-config --libs`
+  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo` -Wno-long-long
+  LLVM_LDFLAGS=`llvm-config --ldflags backend bitreader engine ipo`
+  LLVM_LIBS=`llvm-config --libs backend bitreader engine ipo`
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
-- 
cgit v1.2.3


From 57d00016cab9afa3e7853d9830044a8ece9541c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Fri, 23 Jan 2009 12:32:35 +0000
Subject: glew: Initial import.

From glew 1.5.1 release.
---
 configs/beos           | 2 +-
 configs/darwin         | 2 +-
 configs/darwin-x86ppc  | 2 +-
 configs/default        | 4 +++-
 configs/freebsd-dri    | 2 +-
 configs/linux-cell     | 2 +-
 configs/linux-directfb | 2 +-
 configs/linux-dri-xcb  | 4 ++--
 configs/linux-fbdev    | 2 +-
 configs/linux-indirect | 2 +-
 configs/linux-solo     | 2 +-
 11 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'configs')

diff --git a/configs/beos b/configs/beos
index 897c36868f..69a8fd4269 100644
--- a/configs/beos
+++ b/configs/beos
@@ -90,7 +90,7 @@ else
 endif
 
 # Directories
-SRC_DIRS = gallium mesa glu glut/beos
+SRC_DIRS = gallium mesa glu glut/beos glew
 GLU_DIRS = sgi
 DRIVER_DIRS = beos
 PROGRAM_DIRS = beos samples redbook demos tests
diff --git a/configs/darwin b/configs/darwin
index 77edf1a7b9..c50ea9c44d 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -47,7 +47,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = glx/x11 mesa glu glut/glx
+SRC_DIRS = glx/x11 mesa glu glut/glx glew
 GLU_DIRS = sgi
 DRIVER_DIRS = osmesa
 #DRIVER_DIRS = dri
diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc
index ebeb25051f..3d82e3040a 100644
--- a/configs/darwin-x86ppc
+++ b/configs/darwin-x86ppc
@@ -29,5 +29,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
 
 # omit glw lib for now:
-SRC_DIRS = gallium mesa glu glut/glx
+SRC_DIRS = gallium mesa glu glut/glx glew
 
diff --git a/configs/default b/configs/default
index 6f5f373b59..6fb8d58820 100644
--- a/configs/default
+++ b/configs/default
@@ -48,6 +48,7 @@ INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
 GL_LIB = GL
 GLU_LIB = GLU
 GLUT_LIB = glut
+GLEW_LIB = GLEW
 GLW_LIB = GLw
 OSMESA_LIB = OSMesa
 
@@ -56,6 +57,7 @@ OSMESA_LIB = OSMesa
 GL_LIB_NAME = lib$(GL_LIB).so
 GLU_LIB_NAME = lib$(GLU_LIB).so
 GLUT_LIB_NAME = lib$(GLUT_LIB).so
+GLEW_LIB_NAME = lib$(GLEW_LIB).so
 GLW_LIB_NAME = lib$(GLW_LIB).so
 OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
 
@@ -77,7 +79,7 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glw
+SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
 GLU_DIRS = sgi
 DRIVER_DIRS = 
 # Which subdirs under $(TOP)/progs/ to enter:
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index f7e1fa0c19..0ec25f916e 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -41,7 +41,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
 
 
 # Directories
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw
 DRIVER_DIRS = dri
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
diff --git a/configs/linux-cell b/configs/linux-cell
index 115604ad65..df08d262bd 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -33,7 +33,7 @@ CFLAGS = $(OPT_FLAGS) -Wall -Winline -Wmissing-prototypes \
 CXXFLAGS = $(CFLAGS)
 
 # Omitting glw here:
-SRC_DIRS = gallium mesa gallium/winsys glu glut/glx
+SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glew
 
 
 MKDEP_OPTIONS = -fdepend -Y
diff --git a/configs/linux-directfb b/configs/linux-directfb
index b1fb914a2d..9ae3de96d1 100644
--- a/configs/linux-directfb
+++ b/configs/linux-directfb
@@ -26,7 +26,7 @@ ifeq ($(HAVE_X86), yes)
 endif
 
 # Directories
-SRC_DIRS     = gallium mesa glu glut/directfb
+SRC_DIRS     = gallium mesa glu glut/directfb glew
 GLU_DIRS     = sgi
 DRIVER_DIRS  = directfb
 PROGRAM_DIRS = demos directfb
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index d7b00a266e..e9c15a82e4 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -56,10 +56,10 @@ USING_EGL=0
 
 # Directories
 ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glew glw
 PROGRAM_DIRS = egl
 else
-SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw
+SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw
 PROGRAM_DIRS = xdemos
 endif
 
diff --git a/configs/linux-fbdev b/configs/linux-fbdev
index f54c73695a..0b03c33afa 100644
--- a/configs/linux-fbdev
+++ b/configs/linux-fbdev
@@ -9,7 +9,7 @@ CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID
 # Work around aliasing bugs - developers should comment this out
 CFLAGS += -fno-strict-aliasing
 
-SRC_DIRS = gallium mesa glu glut/fbdev
+SRC_DIRS = gallium mesa glu glut/fbdev glew
 DRIVER_DIRS = fbdev osmesa
 PROGRAM_DIRS = fbdev demos redbook samples
 
diff --git a/configs/linux-indirect b/configs/linux-indirect
index 310ae6dde6..4b81383c07 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -47,7 +47,7 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
 
 
 # Directories
-SRC_DIRS = glx/x11 glu glut/glx glw
+SRC_DIRS = glx/x11 glu glut/glx glew glw
 DRIVER_DIRS =
 PROGRAM_DIRS = 
 WINDOW_SYSTEM=dri
diff --git a/configs/linux-solo b/configs/linux-solo
index 4be7680ca5..247a2d489a 100644
--- a/configs/linux-solo
+++ b/configs/linux-solo
@@ -46,7 +46,7 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
 APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
 
 # Directories
-SRC_DIRS = glx/mini gallium mesa glu glut/mini
+SRC_DIRS = glx/mini gallium mesa glu glut/mini glew
 DRIVER_DIRS = dri
 PROGRAM_DIRS = miniglx
 
-- 
cgit v1.2.3


From fcf9353fea8343a1a86c8c6e0144c8429440c648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Sat, 24 Jan 2009 16:54:59 +0000
Subject: glew: Build it as a static lib.

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 6fb8d58820..40f3a2a02d 100644
--- a/configs/default
+++ b/configs/default
@@ -57,7 +57,7 @@ OSMESA_LIB = OSMesa
 GL_LIB_NAME = lib$(GL_LIB).so
 GLU_LIB_NAME = lib$(GLU_LIB).so
 GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLEW_LIB_NAME = lib$(GLEW_LIB).so
+GLEW_LIB_NAME = lib$(GLEW_LIB).a
 GLW_LIB_NAME = lib$(GLW_LIB).so
 OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
 
-- 
cgit v1.2.3


From 14f79d46a56797924550dfdb3846c8c589637319 Mon Sep 17 00:00:00 2001
From: Jerome Glisse <glisse@freedesktop.org>
Date: Thu, 18 Dec 2008 13:36:07 +0100
Subject: gallium autoconf/automake

---
 configs/autoconf.in | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/autoconf.in b/configs/autoconf.in
index 4a89716ab6..a8970f7d65 100644
--- a/configs/autoconf.in
+++ b/configs/autoconf.in
@@ -55,11 +55,17 @@ LIB_DIR = @LIB_DIR@
 SRC_DIRS = @SRC_DIRS@
 GLU_DIRS = @GLU_DIRS@
 DRIVER_DIRS = @DRIVER_DIRS@
+GALLIUM_AUXILIARY_DIRS = @GALLIUM_AUXILIARY_DIRS@
+GALLIUM_DRIVER_DIRS = @GALLIUM_DRIVER_DIRS@
+GALLIUM_WINSYS_DIRS = @GALLIUM_WINSYS_DIRS@ 
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = @PROGRAM_DIRS@
 
 # Driver specific build vars
-DRI_DIRS = @DRI_DIRS@
+#DRI_DIRS = @DRI_DIRS@ 
 WINDOW_SYSTEM = @WINDOW_SYSTEM@
 USING_EGL = @USING_EGL@
 
-- 
cgit v1.2.3


From fbeeb6675733f5b2da36d40b0142dadf8cc953b4 Mon Sep 17 00:00:00 2001
From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Mon, 12 Jan 2009 01:40:50 -0800
Subject: r300, amd: Make everything build. (Not necessarily work, mind you.)

Lots of structural work, especially in getting the two parts to talk nicely.

Todo:
- Get damn blitter working.
- Add CS flush.
- Reverse order of above two items.
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 40f3a2a02d..333f0fe985 100644
--- a/configs/default
+++ b/configs/default
@@ -91,7 +91,7 @@ EGL_DRIVERS_DIRS = demo
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 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_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover r300
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
-- 
cgit v1.2.3


From 3120894c6d33a26cda642246344e8945db200ac2 Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 5 Feb 2009 14:44:17 +0000
Subject: gallium: add new aux lib for index list translations

Could this be the ultimate index list translating utility?  Maybe, but it
doesn't yet include support for splitting primitives.

Unlike previous attempts, this captures all possible combinations of API
and hardware provoking vertex, supports generated list reuse and various
other tricks.  Relies on python-generated code.
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 40f3a2a02d..13bda58f18 100644
--- a/configs/default
+++ b/configs/default
@@ -89,7 +89,7 @@ PROGRAM_DIRS = demos redbook samples glsl xdemos
 EGL_DRIVERS_DIRS = demo
 
 # Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
+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)
-- 
cgit v1.2.3


From 0bf152e0be48d8dc557c3ecdb02ef4d0b092fed5 Mon Sep 17 00:00:00 2001
From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Fri, 6 Feb 2009 13:27:51 -0800
Subject: Remove r300 from default build.

---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index 333f0fe985..659b1989d2 100644
--- a/configs/default
+++ b/configs/default
@@ -91,7 +91,7 @@ EGL_DRIVERS_DIRS = demo
 # Gallium directories and 
 GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
 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 r300
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover
 GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
 GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
-- 
cgit v1.2.3


From 5538323005a20d6911c7e51cb5f26b242c04a57c Mon Sep 17 00:00:00 2001
From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Fri, 6 Feb 2009 13:36:31 -0800
Subject: Readd trace to list of default pipe drivers.

Looks like the gallium-0.2-radeon merge clobbered it.
---
 configs/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configs')

diff --git a/configs/default b/configs/default
index cda9a5b037..13bda58f18 100644
--- a/configs/default
+++ b/configs/default
@@ -91,7 +91,7 @@ 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
+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
 
-- 
cgit v1.2.3