Cell: added linux-cell-debug config

linux-cell is now the optimized configuration.
Remove some Cell-specific stuff from winsys/xlib/Makefile.

diff --git a/Makefile b/Makefile
index 684126135dc511cb4004678c7b3b8d007a41057f..b6b8bce3e791a2ab66b8a02c5d8f47a6ce3ca739 100644 (file)
--- 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 1f02e80edb646f0d93278692e1c774b6915472dd..cdaa17c66369e27d46ab0289ff65cec8df63f871 100644 (file)
--- 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 (file)
index 0000000..ba333bb
--- /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 ec92c790685c080aff1199195ef64215053d02ce..11c76324113db8d793601a027e1f2b479e8db3dc 100644 (file)
--- 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) \