From c28f413e50405b0b8a830afd3072631074e56978 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sun, 2 Sep 2012 17:38:51 +0000 Subject: [PATCH] remove obsolete IBM Cell SDK makefiles --- Demos/BasicDemo/Makefile.original | 49 ----- Demos/CellSpuDemo/ibmsdk/Makefile | 69 -------- Demos/OpenGL/ibmsdk/Makefile | 45 ----- Demos/VoronoiFractureDemo/Makefile.original | 49 ----- src/BulletCollision/ibmsdk/Makefile | 112 ------------ src/BulletDynamics/ibmsdk/Makefile | 53 ------ src/BulletMultiThreaded/Makefile.original | 187 -------------------- src/LinearMath/ibmsdk/Makefile | 39 ---- src/ibmsdk/Makefile | 16 -- 9 files changed, 619 deletions(-) delete mode 100644 Demos/BasicDemo/Makefile.original delete mode 100755 Demos/CellSpuDemo/ibmsdk/Makefile delete mode 100644 Demos/OpenGL/ibmsdk/Makefile delete mode 100644 Demos/VoronoiFractureDemo/Makefile.original delete mode 100644 src/BulletCollision/ibmsdk/Makefile delete mode 100644 src/BulletDynamics/ibmsdk/Makefile delete mode 100644 src/BulletMultiThreaded/Makefile.original delete mode 100644 src/LinearMath/ibmsdk/Makefile delete mode 100644 src/ibmsdk/Makefile diff --git a/Demos/BasicDemo/Makefile.original b/Demos/BasicDemo/Makefile.original deleted file mode 100644 index 53d3eaeb5..000000000 --- a/Demos/BasicDemo/Makefile.original +++ /dev/null @@ -1,49 +0,0 @@ -__ARCH_BITS__ := 32 - -# define macros -RM=rm -f -OUTDIR=. -CELLSDKDIR=/opt/ibm/cell-sdk -ARCHITECTUREFLAG=-m$(__ARCH_BITS__) -USE_CESOF=1 -ifeq "$(__ARCH_BITS__)" "64" - DEFFLAGS= -DUSE_LIBSPE2 -DUSE_ADDR64 -DUSE_PARALLEL_DISPATCHER - GCC=ppu-g++ -else - DEFFLAGS= -DUSE_LIBSPE2 -DUSE_PARALLEL_DISPATCHER - GCC=ppu32-g++ -endif -DEBUGFLAG= -ifeq "$(USE_CESOF)" "1" - CFLAGS= $(ARCHITECTUREFLAG) $(DEBUGFLAG) -DUSE_CESOF -W -Wall -Winline -O3 -mabi=altivec -maltivec -include altivec.h -include stdbool.h -c -else - CFLAGS= $(ARCHITECTUREFLAG) $(DEBUGFLAG) -W -Wall -Winline -O3 -mabi=altivec -maltivec -include altivec.h -include stdbool.h -c -endif -INCLUDEDIR= -I. -I$(CELLSDKDIR)/prototype/sysroot/usr/include -I../../src -I../OpenGL -LFLAGS= $(ARCHITECTUREFLAG) -Wl,-m,elf$(__ARCH_BITS__)ppc -ifeq "$(USE_CESOF)" "1" - LIBRARIES= -lstdc++ -lsupc++ -lgcc -lgcov -lspe2 -lpthread -L../../out/linuxppc/optimize/libs \ - -lbulletmultithreaded -lspu -lbulletdynamics -lbulletcollision -lbulletmath \ - -L$(CELLSDKDIR)/prototype/sysroot/usr/lib$(__ARCH_BITS__) -R$(CELLSDKDIR)/prototype/sysroot/usr/lib -else - LIBRARIES= -lstdc++ -lsupc++ -lgcc -lgcov -lspe2 -lpthread -L../../out/linuxppc/optimize/libs \ - -lbulletmultithreaded -lbulletdynamics -lbulletcollision -lbulletmath \ - -L$(CELLSDKDIR)/prototype/sysroot/usr/lib$(__ARCH_BITS__) -R$(CELLSDKDIR)/prototype/sysroot/usr/lib -endif - -DemoApplication : - $(GCC) $(DEFFLAGS) $(CFLAGS) $(INCLUDEDIR) -o $(OUTDIR)/$@.o ../OpenGL/$@.cpp - - -BasicDemo : DemoApplication - $(GCC) $(DEFFLAGS) $(CFLAGS) $(INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - - - -all : BasicDemo - $(GCC) -o$(OUTDIR)/BasicDemo $(OUTDIR)/BasicDemo.o $(OUTDIR)/DemoApplication.o $(LFLAGS) $(LIBRARIES) - - -clean : - $(RM) $(OUTDIR)/BasicDemo ; $(RM) $(OUTDIR)/BasicDemo.o ; $(RM) $(OUTDIR)/DemoApplication.o - diff --git a/Demos/CellSpuDemo/ibmsdk/Makefile b/Demos/CellSpuDemo/ibmsdk/Makefile deleted file mode 100755 index 9777906e7..000000000 --- a/Demos/CellSpuDemo/ibmsdk/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# --------------------------------------------------------------- -# PLEASE DO NOT MODIFY THIS SECTION -# This prolog section is automatically generated. -# -# (C) Copyright 2001,2006, -# International Business Machines Corporation, -# -# All Rights Reserved. -# --------------------------------------------------------------- -# -------------------------------------------------------------- -# PROLOG END TAG zYx - -######################################################################## -# Source Code -######################################################################## -VPATH = ../ -######################################################################## -# Target -######################################################################## -ROOT = ../../.. -HOSTINC = /usr/include -PROGRAM_ppu := BasicDemo2 - -####################################################################### -# Objs -###################################################################### -OBJS = BasicDemo2.o - -######################################################################## -# Libraries, Include paths, Defines -######################################################################## -INCLUDE = -DUSE_LIBSPE2 \ - -I../ \ - -I$(ROOT)/src \ - -I$(ROOT)/Demos/OpenGL \ - -I$(HOSTINC) -SYS_LIBS := -lspe2 -lm - -IMPORTS = $(ROOT)/lib/ibmsdk/bulletmultithreaded.a \ - $(ROOT)/lib/ibmsdk/bulletdynamics.a \ - $(ROOT)/lib/ibmsdk/bulletcollision.a \ - $(ROOT)/lib/ibmsdk/bulletmath.a - -####################################################################### -# Install files/dirs -####################################################################### -INSTALL_DIR = $(ROOT)/ibmsdk -INSTALL_FILES = $(PROGRAM_ppu) -######################################################################## -# make.footer -######################################################################## - - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - include $(CELL_TOP)/buildutils/make.footer -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - include $(CELL_TOP)/make.footer -endif - - -$(PPMS): - cp textures/$@ . - -cleanlocal: - rm -f $(PPMS) diff --git a/Demos/OpenGL/ibmsdk/Makefile b/Demos/OpenGL/ibmsdk/Makefile deleted file mode 100644 index 85a19c6e6..000000000 --- a/Demos/OpenGL/ibmsdk/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -#### Source code Dirs -VPATH = ../ - -ROOT = ../../.. -HOST = /usr/include - -#### Library -LIBRARY_ppu = bulletopenglsupport.a - -#### Compiler flags -CPPFLAGS = -DUSE_LIBSPE2 \ --I$(ROOT)/Extras/ConvexHull \ --I$(ROOT)/src/ \ --I$(SDKINC) \ --I$(HOST) - -#### Optimization level flags -#CC_OPT_LEVEL = $(CC_OPT_LEVEL_DEBUG) -CC_OPT_LEVEL = -O3 - -##### Objects to be archived in lib -OBJS = \ -BMF_Api.o \ -BMF_BitmapFont.o \ -BMF_font_helv10.o \ -DemoApplication.o \ -GLDebugDrawer.o \ -GL_ShapeDrawer.o \ -GL_Simplex1to4.o \ -GlutStuff.o \ -RenderTexture.o - -#### Install directories -INSTALL_DIR = $(ROOT)/lib/ibmsdk/ -INSTALL_FILES = $(LIBRARY) - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - include $(CELL_TOP)/buildutils/make.footer -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - include $(CELL_TOP)/make.footer -endif diff --git a/Demos/VoronoiFractureDemo/Makefile.original b/Demos/VoronoiFractureDemo/Makefile.original deleted file mode 100644 index 6db49cd8a..000000000 --- a/Demos/VoronoiFractureDemo/Makefile.original +++ /dev/null @@ -1,49 +0,0 @@ -__ARCH_BITS__ := 32 - -# define macros -RM=rm -f -OUTDIR=. -CELLSDKDIR=/opt/ibm/cell-sdk -ARCHITECTUREFLAG=-m$(__ARCH_BITS__) -USE_CESOF=1 -ifeq "$(__ARCH_BITS__)" "64" - DEFFLAGS= -DUSE_LIBSPE2 -DUSE_ADDR64 -DUSE_PARALLEL_DISPATCHER - GCC=ppu-g++ -else - DEFFLAGS= -DUSE_LIBSPE2 -DUSE_PARALLEL_DISPATCHER - GCC=ppu32-g++ -endif -DEBUGFLAG= -ifeq "$(USE_CESOF)" "1" - CFLAGS= $(ARCHITECTUREFLAG) $(DEBUGFLAG) -DUSE_CESOF -W -Wall -Winline -O3 -mabi=altivec -maltivec -include altivec.h -include stdbool.h -c -else - CFLAGS= $(ARCHITECTUREFLAG) $(DEBUGFLAG) -W -Wall -Winline -O3 -mabi=altivec -maltivec -include altivec.h -include stdbool.h -c -endif -INCLUDEDIR= -I. -I$(CELLSDKDIR)/prototype/sysroot/usr/include -I../../src -I../OpenGL -LFLAGS= $(ARCHITECTUREFLAG) -Wl,-m,elf$(__ARCH_BITS__)ppc -ifeq "$(USE_CESOF)" "1" - LIBRARIES= -lstdc++ -lsupc++ -lgcc -lgcov -lspe2 -lpthread -L../../out/linuxppc/optimize/libs \ - -lbulletmultithreaded -lspu -lbulletdynamics -lbulletcollision -lbulletmath \ - -L$(CELLSDKDIR)/prototype/sysroot/usr/lib$(__ARCH_BITS__) -R$(CELLSDKDIR)/prototype/sysroot/usr/lib -else - LIBRARIES= -lstdc++ -lsupc++ -lgcc -lgcov -lspe2 -lpthread -L../../out/linuxppc/optimize/libs \ - -lbulletmultithreaded -lbulletdynamics -lbulletcollision -lbulletmath \ - -L$(CELLSDKDIR)/prototype/sysroot/usr/lib$(__ARCH_BITS__) -R$(CELLSDKDIR)/prototype/sysroot/usr/lib -endif - -DemoApplication : - $(GCC) $(DEFFLAGS) $(CFLAGS) $(INCLUDEDIR) -o $(OUTDIR)/$@.o ../OpenGL/$@.cpp - - -BasicDemo : DemoApplication - $(GCC) $(DEFFLAGS) $(CFLAGS) $(INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - - - -all : BasicDemo - $(GCC) -o$(OUTDIR)/BasicDemo $(OUTDIR)/BasicDemo.o $(OUTDIR)/DemoApplication.o $(LFLAGS) $(LIBRARIES) - - -clean : - $(RM) $(OUTDIR)/BasicDemo ; $(RM) $(OUTDIR)/BasicDemo.o ; $(RM) $(OUTDIR)/DemoApplication.o - diff --git a/src/BulletCollision/ibmsdk/Makefile b/src/BulletCollision/ibmsdk/Makefile deleted file mode 100644 index 8a7878326..000000000 --- a/src/BulletCollision/ibmsdk/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -#### Source code Dirs -VPATH = \ -../BroadphaseCollision \ -../CollisionDispatch \ -../NarrowPhaseCollision \ -../CollisionShapes - -ROOT = ../../.. - -#### Library -LIBRARY_ppu = bulletcollision.a - -#### Compiler flags -CPPFLAGS = \ --DUSE_LIBSPE2 \ --I../BroadphaseCollision \ --I../CollisionDispath \ --I../NarrowPhaseCollision \ --I../CollisionShapes \ --I$(ROOT)/src/ \ --I$(SDKINC) - -#### Optimization level flags -#CC_OPT_LEVEL = $(CC_OPT_LEVEL_DEBUG) -CC_OPT_LEVEL = -O3 - -##### Objects to be archived in lib - -OBJS = \ -btAxisSweep3.o \ -btQuantizedBvh.o \ -btBroadphaseProxy.o \ -btCollisionAlgorithm.o \ -btDispatcher.o \ -btDbvtBroadphase.o \ -btDbvt.o \ -btOverlappingPairCache.o \ -btSimpleBroadphase.o \ -btContinuousConvexCollision.o \ -btConvexCast.o \ -btGjkConvexCast.o \ -btGjkEpa2.o \ -btGjkEpaPenetrationDepthSolver.o \ -btGjkPairDetector.o \ -btDefaultCollisionConfiguration.o \ -btMinkowskiPenetrationDepthSolver.o \ -btPersistentManifold.o \ -btRaycastCallback.o \ -btSubSimplexConvexCast.o \ -btVoronoiSimplexSolver.o \ -btCollisionDispatcher.o \ -btCollisionObject.o \ -btCollisionWorld.o \ -btCompoundCollisionAlgorithm.o \ -btBoxBoxCollisionAlgorithm.o \ -btBoxBoxDetector.o \ -btConvexPlaneCollisionAlgorithm.o \ -btConvexConcaveCollisionAlgorithm.o \ -btConvexConvexAlgorithm.o \ -btDefaultCollisionConfiguration.o \ -btEmptyCollisionAlgorithm.o \ -btManifoldResult.o \ -btSimulationIslandManager.o \ -btSphereBoxCollisionAlgorithm.o \ -btSphereSphereCollisionAlgorithm.o \ -btSphereTriangleCollisionAlgorithm.o \ -btActivatingCollisionAlgorithm.o \ -btUnionFind.o \ -SphereTriangleDetector.o \ -btBoxShape.o \ -btBvhTriangleMeshShape.o \ -btCapsuleShape.o \ -btCollisionShape.o \ -btCompoundShape.o \ -btConcaveShape.o \ -btConeShape.o \ -btConvexHullShape.o \ -btConvexShape.o \ -btConvexInternalShape.o \ -btConvexTriangleMeshShape.o \ -btCylinderShape.o \ -btEmptyShape.o \ -btHeightfieldTerrainShape.o \ -btMinkowskiSumShape.o \ -btMultiSphereShape.o \ -btOptimizedBvh.o \ -btPolyhedralConvexShape.o \ -btSphereShape.o \ -btStaticPlaneShape.o \ -btStridingMeshInterface.o \ -btTetrahedronShape.o \ -btTriangleBuffer.o \ -btTriangleCallback.o \ -btTriangleIndexVertexArray.o \ -btTriangleMesh.o \ -btTriangleMeshShape.o \ -btUniformScalingShape.o - -#### Install directories -INSTALL_DIR = $(ROOT)/lib/ibmsdk -INSTALL_FILES = $(LIBRARY_ppu) - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - include $(CELL_TOP)/buildutils/make.footer -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - include $(CELL_TOP)/make.footer -endif - diff --git a/src/BulletDynamics/ibmsdk/Makefile b/src/BulletDynamics/ibmsdk/Makefile deleted file mode 100644 index 57505d835..000000000 --- a/src/BulletDynamics/ibmsdk/Makefile +++ /dev/null @@ -1,53 +0,0 @@ -#### Source code Dirs -VPATH = \ -../ConstraintSolver \ -../Dynamics \ -../Vehicle - -ROOT = ../../.. - -#### Library -LIBRARY_ppu = bulletdynamics.a - -#### Compiler flags -CPPFLAGS = \ --DUSE_LIBSPE2 \ --I../ConstraintSolver \ --I../Dynamics \ --I../Vehicle \ --I$(ROOT)/src \ --I$(SDKINC) - -#### Optimization level flags -#CC_OPT_LEVEL = $(CC_OPT_LEVEL_DEBUG) -CC_OPT_LEVEL = -O3 - -##### Objects to be archived in lib - -OBJS = \ -btContactConstraint.o \ -btGeneric6DofConstraint.o \ -btHingeConstraint.o \ -btPoint2PointConstraint.o \ -btSequentialImpulseConstraintSolver.o \ -btSolve2LinearConstraint.o \ -btTypedConstraint.o \ -btDiscreteDynamicsWorld.o \ -btRigidBody.o \ -btSimpleDynamicsWorld.o \ -btRaycastVehicle.o \ -btWheelInfo.o -#### Install directories -INSTALL_DIR = $(ROOT)/lib/ibmsdk -INSTALL_FILES = $(LIBRARY_ppu) - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - include $(CELL_TOP)/buildutils/make.footer -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - include $(CELL_TOP)/make.footer -endif - diff --git a/src/BulletMultiThreaded/Makefile.original b/src/BulletMultiThreaded/Makefile.original deleted file mode 100644 index d0a8318b6..000000000 --- a/src/BulletMultiThreaded/Makefile.original +++ /dev/null @@ -1,187 +0,0 @@ -__ARCH_BITS__ := 32 - -# define macros -NARROWPHASEDIR=./SpuNarrowPhaseCollisionTask -SPU_TASKFILE=$(NARROWPHASEDIR)/SpuGatheringCollisionTask - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - CELL_SYSROOT := /opt/cell/sysroot -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - CELL_SYSROOT := $(CELL_TOP)/sysroot -endif - - -USE_CCACHE=ccache -RM=rm -f -OUTDIR=./out -DEBUGFLAG=-DNDEBUG -LIBOUTDIR=../../lib/ibmsdk -COLLISIONDIR=../../src/BulletCollision -MATHDIR=../../src/LinearMath -ARCHITECTUREFLAG=-m$(__ARCH_BITS__) -ifeq "$(__ARCH_BITS__)" "64" - SPU_DEFFLAGS= -DUSE_LIBSPE2 -D__SPU__ -DUSE_ADDR64 -else - SPU_DEFFLAGS= -DUSE_LIBSPE2 -D__SPU__ -endif - -SPU_DEFFLAGS+=-DUSE_PE_BOX_BOX - -SPU_GCC=$(USE_CCACHE) /usr/bin/spu-gcc -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 -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_LFLAGS= -Wl,-N -SPU_LIBRARIES=-lstdc++ -SPU_EMBED=/usr/bin/ppu-embedspu -SPU_AR=/usr/bin/ar -SYMBOLNAME=spu_program - -ifeq "$(__ARCH_BITS__)" "64" - PPU_DEFFLAGS= -DUSE_LIBSPE2 -DUSE_ADDR64 - PPU_GCC=$(USE_CCACHE) /usr/bin/ppu-gcc -else - PPU_DEFFLAGS= -DUSE_LIBSPE2 - PPU_GCC=$(USE_CCACHE) /usr/bin/ppu32-gcc -endif - -PPU_CFLAGS= $(ARCHITECTUREFLAG) $(DEBUGFLAG) -W -Wall -Winline -O3 -c -mabi=altivec -maltivec -include altivec.h -include stdbool.h -PPU_INCLUDEDIR= -I. -I$(CELL_SYSROOT)/usr/include -I../../src -I$(NARROWPHASEDIR) -PPU_LFLAGS= $(ARCHITECTUREFLAG) -Wl,-m,elf$(__ARCH_BITS__)ppc -PPU_LIBRARIES= -lstdc++ -lsupc++ -lgcc -lgcov -lspe2 -lpthread -L../../lib/ibmsdk -lbulletcollision -lbulletdynamics -lbulletmath -L$(CELL_SYSROOT)/usr/lib$(__ARCH_BITS__) -R$(CELL_SYSROOT)/usr/lib -PPU_AR=/usr/bin/ar - -MakeOut : -# rm -f -R $(OUTDIR) ; mkdir $(OUTDIR) - @echo "usage: make spu, make ppu, make all, or make clean" -# SPU -SpuTaskFile : MakeOut - $(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 - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -SpuContactManifoldCollisionAlgorithm_spu : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o SpuContactManifoldCollisionAlgorithm.cpp - -SpuCollisionShapes : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp - -SpuContactResult : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp - -#SpuGatheringCollisionTask : MakeOut -# $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp - -SpuGjkPairDetector: MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp - -SpuMinkowskiPenetrationDepthSolver : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp - -SpuVoronoiSimplexSolver : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(NARROWPHASEDIR)/$@.cpp - -#SpuLibspe2Support_spu : MakeOut -# $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o SpuLibspe2Support.cpp - -## SPU-Bullet -btPersistentManifold : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(COLLISIONDIR)/NarrowPhaseCollision/$@.cpp - -btOptimizedBvh : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(COLLISIONDIR)/CollisionShapes/$@.cpp - -btCollisionObject : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(COLLISIONDIR)/CollisionDispatch/$@.cpp - -btTriangleCallback : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(COLLISIONDIR)/CollisionShapes/$@.cpp - -btTriangleIndexVertexArray : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(COLLISIONDIR)/CollisionShapes/$@.cpp - -btStridingMeshInterface : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(COLLISIONDIR)/CollisionShapes/$@.cpp - -btAlignedAllocator : MakeOut - $(SPU_GCC) $(SPU_DEFFLAGS) $(SPU_CFLAGS) $(SPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $(MATHDIR)/$@.cpp - - -# PPU -SpuGatheringCollisionDispatcher : MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -SequentialThreadSupport: MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -SpuLibspe2Support: MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -btThreadSupportInterface: MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -SpuCollisionTaskProcess : MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -SpuContactManifoldCollisionAlgorithm : MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - -SpuSampleTaskProcess : MakeOut - $(PPU_GCC) $(PPU_DEFFLAGS) $(PPU_CFLAGS) $(PPU_INCLUDEDIR) -o $(OUTDIR)/$@.o $@.cpp - - - -spu : boxBoxDistance SpuFakeDma SpuContactManifoldCollisionAlgorithm_spu SpuContactResult SpuTaskFile \ - SpuGjkPairDetector SpuMinkowskiPenetrationDepthSolver SpuVoronoiSimplexSolver SpuCollisionShapes \ - btPersistentManifold btOptimizedBvh btCollisionObject btTriangleCallback btTriangleIndexVertexArray \ - btStridingMeshInterface btAlignedAllocator - $(SPU_GCC) -o $(OUTDIR)/spuCollision.elf \ - $(OUTDIR)/SpuTaskFile.o \ - $(OUTDIR)/SpuFakeDma.o \ - $(OUTDIR)/boxBoxDistance.o \ - $(OUTDIR)/SpuContactManifoldCollisionAlgorithm_spu.o \ - $(OUTDIR)/SpuContactResult.o \ - $(OUTDIR)/SpuCollisionShapes.o \ - $(OUTDIR)/SpuGjkPairDetector.o \ - $(OUTDIR)/SpuMinkowskiPenetrationDepthSolver.o \ - $(OUTDIR)/SpuVoronoiSimplexSolver.o \ - $(OUTDIR)/btPersistentManifold.o \ - $(OUTDIR)/btTriangleCallback.o \ - $(OUTDIR)/btTriangleIndexVertexArray.o \ - $(OUTDIR)/btStridingMeshInterface.o \ - $(OUTDIR)/btAlignedAllocator.o \ - $(SPU_LFLAGS) $(SPU_LIBRARIES) - -spu-embed : spu - $(SPU_EMBED) $(ARCHITECTUREFLAG) $(SYMBOLNAME) $(OUTDIR)/spuCollision.elf $(OUTDIR)/$@.o - $(SPU_AR) -qcs $(LIBOUTDIR)/libspu.a $(OUTDIR)/$@.o - - - -ppu : SpuGatheringCollisionDispatcher SpuCollisionTaskProcess btThreadSupportInterface \ - SpuLibspe2Support SpuContactManifoldCollisionAlgorithm SpuSampleTaskProcess - $(PPU_AR) -qcs $(LIBOUTDIR)/bulletmultithreaded.a \ - $(OUTDIR)/SpuCollisionTaskProcess.o \ - $(OUTDIR)/SpuSampleTaskProcess.o \ - $(OUTDIR)/SpuGatheringCollisionDispatcher.o \ - $(OUTDIR)/SpuLibspe2Support.o \ - $(OUTDIR)/btThreadSupportInterface.o \ - $(OUTDIR)/SpuContactManifoldCollisionAlgorithm.o - -all : spu-embed ppu - -clean: - $(RM) $(OUTDIR)/* ; $(RM) $(LIBOUTDIR)/libspu.a ; $(RM) $(LIBOUTDIR)/bulletmultithreaded.a - - - - diff --git a/src/LinearMath/ibmsdk/Makefile b/src/LinearMath/ibmsdk/Makefile deleted file mode 100644 index 04148730f..000000000 --- a/src/LinearMath/ibmsdk/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -#### Source code Dirs -VPATH = ../ - -ROOT = ../../.. - -#### Library -LIBRARY_ppu = bulletmath.a - -#### Compiler flags -CPPFLAGS = \ --DUSE_LIBSPE2 \ --I$(ROOT)/src \ --I$(SDKINC) - -#### Optimization level flags -#CC_OPT_LEVEL = $(CC_OPT_LEVEL_DEBUG) -CC_OPT_LEVEL = -O3 - -##### Objects to be archived in lib - -OBJS = \ -btAlignedAllocator.o \ -btGeometryUtil.o \ -btQuickprof.o - -#### Install directories -INSTALL_DIR = $(ROOT)/lib/ibmsdk -INSTALL_FILES = $(LIBRARY_ppu) - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - include $(CELL_TOP)/buildutils/make.footer -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - include $(CELL_TOP)/make.footer -endif - diff --git a/src/ibmsdk/Makefile b/src/ibmsdk/Makefile deleted file mode 100644 index 1a0453eef..000000000 --- a/src/ibmsdk/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -#### Visit Bullet library ibmsdk dirs and build code - -DIRS := \ -../BulletCollision/ibmsdk \ -../BulletDynamics/ibmsdk \ -../LinearMath/ibmsdk - -IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi) - -ifeq ("$(IBM_CELLSDK_VERSION)","3.0") - CELL_TOP ?= /opt/cell/sdk - include $(CELL_TOP)/buildutils/make.footer -else - CELL_TOP ?= /opt/ibm/cell-sdk/prototype - include $(CELL_TOP)/make.footer -endif