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.
---
 Makefile                         |  1 +
 configs/linux-cell               |  6 ++++--
 configs/linux-cell-debug         | 10 ++++++++++
 src/gallium/winsys/xlib/Makefile |  5 +----
 4 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 configs/linux-cell-debug

diff --git a/Makefile b/Makefile
index 684126135d..b6b8bce3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ linux \
 linux-alpha \
 linux-alpha-static \
 linux-cell \
+linux-cell-debug \
 linux-debug \
 linux-directfb \
 linux-dri \
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
+
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index ec92c79068..11c7632411 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -33,10 +33,7 @@ XLIB_WINSYS_SOURCES = \
 XLIB_WINSYS_OBJECTS = $(XLIB_WINSYS_SOURCES:.c=.o)
 
 
-ifeq ($(CONFIG_NAME), linux-cell)
-# The SPU code is in a separate .a file, unfortunately
-CELL_SPU_LIB = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
-endif
+# Note: CELL_SPU_LIB is only defined for cell configs
 
 LIBS = \
 	$(GALLIUM_DRIVERS) \
-- 
cgit v1.2.3