X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=configs%2Flinux-cell;h=3322f114ba7a1c730929709cc9029516923b35b1;hb=a8e7852b05f95cc695f3a05692a6ccd36298faf7;hp=f581b5a6fe3c7a6db490a5e16cbb5b38077c6283;hpb=6f44a21348cb70601fc138150bb603fa527d6b63;p=mesa.git

diff --git a/configs/linux-cell b/configs/linux-cell
index f581b5a6fe3..3322f114ba7 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -1,44 +1,64 @@
-# linux-cell
+# linux-cell  (non-debug build)
 
 include $(TOP)/configs/default
 
 CONFIG_NAME = linux-cell
 
 
+# Omiting other gallium drivers:
+GALLIUM_DRIVER_DIRS = cell softpipe
+
+
 # Compiler and flags
-CC = /usr/bin/ppu32-gcc
-CXX = /usr/bin/ppu32-g++
+CC = ppu32-gcc
+CXX = ppu32-g++
+HOST_CC = gcc
+APP_CC = gcc
+APP_CXX = g++
+
+OPT_FLAGS = -O3
 
 # 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 = -g -W -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I/usr/include -I$(SDK)/include -include altivec.h
+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
 
 CXXFLAGS = $(CFLAGS)
 
 # Omitting glw here:
-SRC_DIRS = mesa glu glut/glx
+SRC_DIRS = gallium mesa gallium/winsys 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
+	-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
 
-SPU_CC = /usr/bin/spu-gcc
+SPU_CC = 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 = $(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
+SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -lm
 
-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