diff options
author | Ben Skeggs <[email protected]> | 2008-02-16 16:30:22 +1100 |
---|---|---|
committer | Ben Skeggs <[email protected]> | 2008-02-16 16:30:22 +1100 |
commit | 87e3301533aa4d3e6e98db139887ebba3d217f7d (patch) | |
tree | ad80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /configs/linux-cell | |
parent | 49405c43f245d3b3ddd12e891413bf7ead23145c (diff) | |
parent | 3320b1874e810583f95b93a89697b2955987b84f (diff) |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/linux-dri
src/mesa/pipe/Makefile
Diffstat (limited to 'configs/linux-cell')
-rw-r--r-- | configs/linux-cell | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configs/linux-cell b/configs/linux-cell index 3d874491e41..09f62fc1ff0 100644 --- a/configs/linux-cell +++ b/configs/linux-cell @@ -21,7 +21,7 @@ CFLAGS = $(OPT_FLAGS) -Wall -Winline -fPIC -m32 -mabi=altivec -maltivec -I. -I$( CXXFLAGS = $(CFLAGS) # Omitting glw here: -SRC_DIRS = mesa glu glut/glx +SRC_DIRS = gallium mesa glu glut/glx MKDEP_OPTIONS = -fdepend -Y @@ -36,7 +36,9 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread \ SPU_CC = spu-gcc -SPU_CFLAGS = $(OPT_FLAGS) -W -Wall -Winline -Wmissing-prototypes -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) \ + -include spu_intrinsics.h SPU_LFLAGS = -L$(SDK)/spu/lib -Wl,-N -lmisc |