summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/xlib
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2008-02-19 11:14:54 -0700
committerBrian <brian.paul@tungstengraphics.com>2008-02-19 11:14:54 -0700
commit3e329ea7e41e8d97de5b5f345ecab0833c8afe70 (patch)
tree2489443562f445b2290d9a9265c4702f1353ed9b /src/gallium/winsys/xlib
parentd11993100289c1597dcfc1cfa36cee3cd7eff103 (diff)
gallium: updated cell build
Building on Ian's Cell build fix. Put libcell.a in the gallium/drivers/cell/ directory. General Makefile clean-up, simplification, updated comments.
Diffstat (limited to 'src/gallium/winsys/xlib')
-rw-r--r--src/gallium/winsys/xlib/Makefile19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile
index 17405388ee..09f10e5ea8 100644
--- a/src/gallium/winsys/xlib/Makefile
+++ b/src/gallium/winsys/xlib/Makefile
@@ -1,4 +1,4 @@
-# src/mesa/Makefile
+# src/gallium/winsys/xlib/Makefile
TOP = ../../../..
include $(TOP)/configs/current
@@ -27,16 +27,17 @@ GL_MINOR = 5
GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+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
+
PIPE_LIB = \
$(GALLIUM_DRIVERS) \
$(TOP)/src/mesa/libglapi.a \
$(TOP)/src/mesa/libmesa.a \
- $(GALLIUM_AUXILIARIES)
-
-ifeq ($(CONFIG_NAME), linux-cell)
-CELL_LIB = $(TOP)/src/gallium/drivers/cell/ppu/libcell.a
-CELL_LIB_SPU = $(TOP)/src/gallium/drivers/cell/spu/g3d_spu.a
-endif
+ $(GALLIUM_AUXILIARIES) \
+ $(CELL_SPU_LIB) \
.SUFFIXES : .cpp
@@ -65,13 +66,13 @@ STAND_ALONE_OBJECTS = \
$(STAND_ALONE_DRIVER_OBJECTS)
# Make the GL library
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB) $(CELL_LIB) $(CELL_LIB_SPU)
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(STAND_ALONE_OBJECTS) $(PIPE_LIB)
$(TOP)/bin/mklib -o $(GL_LIB) \
-linker "$(CC)" \
-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
-install $(TOP)/$(LIB_DIR) \
$(MKLIB_OPTIONS) $(STAND_ALONE_OBJECTS) \
- --start-group $(PIPE_LIB) --end-group $(CELL_LIB) $(CELL_LIB_SPU) $(GL_LIB_DEPS)
+ --start-group $(PIPE_LIB) --end-group $(GL_LIB_DEPS)
######################################################################