Merge branch '7.8'

[mesa.git] / configs / linux-cell

diff --git a/configs/linux-cell b/configs/linux-cell
index df08d262bd340bec0dcd536f72b8f3740f5cff12..0908dba9e05660b0f9e6c20a1a25c1b4d0de78c7 100644 (file)
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -1,12 +1,12 @@
 # linux-cell  (non-debug build)
 
-include $(TOP)/configs/default
+include $(TOP)/configs/linux
 
 CONFIG_NAME = linux-cell
 
 
 # Omiting other gallium drivers:
-GALLIUM_DRIVER_DIRS = cell softpipe trace
+GALLIUM_DRIVERS_DIRS = cell softpipe trace identity
 
 
 # Compiler and flags
@@ -25,15 +25,22 @@ OPT_FLAGS = -O3
 SDK = /opt/cell/sdk/usr
 
 
-CFLAGS = $(OPT_FLAGS) -Wall -Winline -Wmissing-prototypes \
-       -fPIC -m32 -std=c99 -mabi=altivec -maltivec \
+
+COMMON_C_CPP_FLAGS = $(OPT_FLAGS) -Wall -Winline \
+       -fPIC -m32 -mabi=altivec -maltivec \
        -I. -I$(SDK)/include \
-       -DGALLIUM_CELL -DUSE_XSHM -D_BSD_SOURCE
+       -DGALLIUM_CELL $(DEFINES)
+
+CFLAGS = $(COMMON_C_CPP_FLAGS) -Wmissing-prototypes -std=c99
+
+CXXFLAGS = $(COMMON_C_CPP_FLAGS)
 
-CXXFLAGS = $(CFLAGS)
 
 # Omitting glw here:
-SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glew
+SRC_DIRS = glsl mesa gallium gallium/winsys gallium/targets glu glut/glx glew
+
+# Build no traditional Mesa drivers:
+DRIVER_DIRS =
 
 
 MKDEP_OPTIONS = -fdepend -Y