Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fixes for IBM Cell SDK 3.1 build

Browse Source 
to build, go to Bullet/src/ibm_sdk and run make
then, go to Bullet/src/BulletMultiThreaded/ibm_sdk
make -f Makefile.original spu
make -f Makefile.original ppu
This commit is contained in:
erwin.coumans
2008-11-02 09:46:35 +00:00
parent 461602a5f2
commit c34a4a0f71
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletMultiThreaded/Makefile.original
View File

@@ -29,7 +29,7 @@ else
SPU_DEFFLAGS= -DUSE_LIBSPE2 -D__SPU__ SPU_DEFFLAGS= -DUSE_LIBSPE2 -D__SPU__
endif endif
SPU_GCC=$(USE_CCACHE) /usr/bin/spu-gcc SPU_GCC=$(USE_CCACHE) /usr/bin/spu-gcc
SPU_INCLUDEDIR= -I. -I$(CELL_SYSROOT)/usr/spu/include -I../../src -I$(NARROWPHASEDIR) SPU_INCLUDEDIR= -Ivectormath/scalar/cpp -I. -I$(CELL_SYSROOT)/usr/spu/include -I../../src -I$(NARROWPHASEDIR)
#SPU_CFLAGS= $(DEBUGFLAG) -W -Wall -Winline -Os -c -include spu_intrinsics.h -include stdbool.h #SPU_CFLAGS= $(DEBUGFLAG) -W -Wall -Winline -Os -c -include spu_intrinsics.h -include stdbool.h
SPU_CFLAGS= $(DEBUGFLAG) -W -Wall -Winline -O3 -mbranch-hints -fomit-frame-pointer -ftree-vectorize -finline-functions -ftree-vect-loop-version -ftree-loop-optimize -ffast-math -fno-rtti -fno-exceptions -c -include spu_intrinsics.h -include stdbool.h SPU_CFLAGS= $(DEBUGFLAG) -W -Wall -Winline -O3 -mbranch-hints -fomit-frame-pointer -ftree-vectorize -finline-functions -ftree-vect-loop-version -ftree-loop-optimize -ffast-math -fno-rtti -fno-exceptions -c -include spu_intrinsics.h -include stdbool.h
@@ -60,6 +60,9 @@ MakeOut :
SpuTaskFile : MakeOut SpuTaskFile : MakeOut
$(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/SpuTaskFile.o $(SPU_TASKFILE).cpp $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/SpuTaskFile.o $(SPU_TASKFILE).cpp
boxBoxDistance : MakeOut
$(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp
SpuFakeDma : MakeOut SpuFakeDma : MakeOut
$(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp
@@ -131,13 +134,14 @@ SpuSampleTaskProcess : MakeOut
spu : SpuFakeDma SpuContactManifoldCollisionAlgorithm_spu SpuContactResult SpuTaskFile \ spu : boxBoxDistance SpuFakeDma SpuContactManifoldCollisionAlgorithm_spu SpuContactResult SpuTaskFile \
SpuGjkPairDetector SpuMinkowskiPenetrationDepthSolver SpuVoronoiSimplexSolver SpuCollisionShapes \ SpuGjkPairDetector SpuMinkowskiPenetrationDepthSolver SpuVoronoiSimplexSolver SpuCollisionShapes \
btPersistentManifold btOptimizedBvh btCollisionObject btTriangleCallback btTriangleIndexVertexArray \ btPersistentManifold btOptimizedBvh btCollisionObject btTriangleCallback btTriangleIndexVertexArray \
btStridingMeshInterface btAlignedAllocator btStridingMeshInterface btAlignedAllocator
$(SPU_GCC) -o $(OUTDIR)/spuCollision.elf \ $(SPU_GCC) -o $(OUTDIR)/spuCollision.elf \
$(OUTDIR)/SpuTaskFile.o \ $(OUTDIR)/SpuTaskFile.o \
$(OUTDIR)/SpuFakeDma.o \ $(OUTDIR)/SpuFakeDma.o \
$(OUTDIR)/boxBoxDistance.o \
$(OUTDIR)/SpuContactManifoldCollisionAlgorithm_spu.o \ $(OUTDIR)/SpuContactManifoldCollisionAlgorithm_spu.o \
$(OUTDIR)/SpuContactResult.o \ $(OUTDIR)/SpuContactResult.o \
$(OUTDIR)/SpuCollisionShapes.o \ $(OUTDIR)/SpuCollisionShapes.o \

4
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp
View File

@@ -90,8 +90,10 @@ bool gUseEpa = false;
#include <LibSN_SPU.h> #include <LibSN_SPU.h>
#endif //USE_SN_TUNER #endif //USE_SN_TUNER
#if defined (__SPU__) || defined (USE_LIBSPE2) #if defined (__SPU__) && !defined (USE_LIBSPE2)
#include <spu_printf.h> #include <spu_printf.h>
#elif defined (USE_LIBSPE2)
#define spu_printf(a)
#else #else
#define IGNORE_ALIGNMENT 1 #define IGNORE_ALIGNMENT 1
#include <stdio.h> #include <stdio.h>