Merge branch 'mesa_7_7_branch'

[mesa.git] / src / gallium / drivers / cell / spu / Makefile

diff --git a/src/gallium/drivers/cell/spu/Makefile b/src/gallium/drivers/cell/spu/Makefile
index 7aa947299e7abe8aee2d397503ad396f550d9742..3cc52301da25b4071f2e6e81f0997f35fd2df4d1 100644 (file)
--- a/src/gallium/drivers/cell/spu/Makefile
+++ b/src/gallium/drivers/cell/spu/Makefile
@@ -5,7 +5,7 @@
 
 
 TOP = ../../../../..
-include $(TOP)/configs/linux-cell
+include $(TOP)/configs/current
 
 
 PROG = g3d
@@ -16,25 +16,32 @@ PROG_SPU_EMBED_O = $(PROG)_spu-embed.o
 
 
 SOURCES = \
+       spu_command.c \
+       spu_dcache.c \
+       spu_funcs.c \
        spu_main.c \
-       spu_blend.c \
+       spu_per_fragment_op.c \
        spu_render.c \
        spu_texture.c \
        spu_tile.c \
-       spu_tri.c \
+       spu_tri.c
+
+OLD_SOURCES = \
        spu_exec.c \
        spu_util.c \
        spu_vertex_fetch.c \
        spu_vertex_shader.c
 
-SPU_OBJECTS = $(SOURCES:.c=.o) \
 
-SPU_ASM_OUT = $(SOURCES:.c=.s) \
+SPU_OBJECTS = $(SOURCES:.c=.o)
+
+SPU_ASM_OUT = $(SOURCES:.c=.s)
+
 
 INCLUDE_DIRS = \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/gallium/include \
-       -I$(TOP)/src/gallium/aux \
+       -I$(TOP)/src/gallium/auxiliary \
        -I$(TOP)/src/gallium/drivers
 
 
@@ -42,7 +49,7 @@ INCLUDE_DIRS = \
        $(SPU_CC) $(SPU_CFLAGS) -c $<
 
 .c.s:
-       $(SPU_CC) $(SPU_CFLAGS) -S $<
+       $(SPU_CC) $(SPU_CFLAGS) -O3 -S $<
 
 
 # The .a file will be linked into the main/PPU executable