Squashed commit of the following:

[mesa.git] / configs / linux-cell

diff --git a/configs/linux-cell b/configs/linux-cell
index bcf5f00acb8d2d5146add0338e543e963f42e688..e87e69a8065aaa28ec57a5d2769069b815e9a412 100644 (file)
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -1,30 +1,47 @@
-# linux-cell
+# linux-cell  (non-debug build)
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-cell
 
 
-GALLIUM_DRIVER_DIRS += cell
+# Omiting other gallium drivers:
+GALLIUM_DRIVERS_DIRS = cell softpipe trace rbug identity
 
 
 # Compiler and flags
 CC = ppu32-gcc
 CXX = ppu32-g++
 HOST_CC = gcc
+APP_CC = gcc
+APP_CXX = g++
 
-OPT_FLAGS = -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 = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$(SDK)/include -DGALLIUM_CELL
 
-CXXFLAGS = $(CFLAGS)
+COMMON_C_CPP_FLAGS = $(OPT_FLAGS) -Wall -Winline \
+       -fPIC -m32 -mabi=altivec -maltivec \
+       -I. -I$(SDK)/include \
+       -DGALLIUM_CELL $(DEFINES)
+
+CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99
+
+CXXFLAGS = $(COMMON_C_CPP_FLAGS)
+
 
 # Omitting glw here:
-SRC_DIRS = gallium mesa gallium/winsys glu glut/glx
+SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
+       gallium gallium/winsys gallium/targets glu
+
+# Build no traditional Mesa drivers:
+DRIVER_DIRS =
 
 
 MKDEP_OPTIONS = -fdepend -Y
@@ -34,6 +51,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
 
@@ -41,9 +60,10 @@ 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
+SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc -lm
 
 SPU_AR = ppu-ar
 SPU_AR_FLAGS = -qcs