AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-18 21:10:05 +00:00
Code Issues Releases Wiki Activity

updated build systems/GPU_physics for Mac OS X

Browse Source
This commit is contained in:
ejcoumans 2006-12-08 22:04:02 +00:00
parent 1aa4e010f0
commit f9832f6b88
15 changed files with 119 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/BspDemo/Jamfile
View File

@ -1,3 +1,3 @@
SubDir TOP Demos BspDemo ;
ExtraDemo BspDemo : [ Wildcard *.h *.cpp ] ;
BulletDemo BspDemo : [ Wildcard *.h *.cpp ] ;

2
Demos/BulletDinoDemo/Jamfile
View File

@ -1,3 +1,3 @@
SubDir TOP Demos BulletDinoDemo ;
ExtraDemo BulletDino : [ Wildcard *.h *.c ] ;
BulletDemo BulletDino : [ Wildcard *.h *.c ] ;

28
Demos/ColladaDemo/Jamfile
View File

@ -1,4 +1,30 @@
SubDir TOP Demos ColladaDemo ;
ExtraDemo ColladaDemo : [ Wildcard *.h *.cpp ] ;
#some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo3
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : colladadom libxml bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
[ FIncludes $(TOP)/Extras/LibXML ]
[ FIncludes $(TOP)/Extras/LibXML/include ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/COLLADA_DOM/include"
"../../Extras/COLLADA_DOM/include/1.4"
"../../Extras/LibXML"
"../../Extras/LibXML/include" ;
}
ExtraDemo3 ColladaDemo : [ Wildcard *.h *.cpp ] ;
MsvcIncDirs ColladaDemo : "../../Extras/FCollada" ;

19
Demos/ConvexDecompositionDemo/Jamfile
View File

@ -1,3 +1,20 @@
SubDir TOP Demos ConvexDecompositionDemo ;
ExtraDemo ConvexDecompositionDemo : [ Wildcard *.h *.cpp ] ;
#some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo2
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/ConvexDecomposition" ;
}
ExtraDemo2 ConvexDecompositionDemo : [ Wildcard *.h *.cpp ] ;

22
Demos/EPAPenDepthDemo/Jamfile
View File

@ -1,3 +1,23 @@
SubDir TOP Demos EPAPenDepthDemo ;
ExtraDemo EPAPenDepthDemo : [ Wildcard *.h *.cpp ../../Extras/ExtraSolid35/*.cpp ../../Extras/EPA/*.cpp ] ;
#some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo4
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTBullet GIMPACT bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/GIMPACT/include ]
[ FIncludes $(TOP)/Extras/GIMPACTBullet ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/GIMPACT/include"
"../../Extras/GIMPACTBullet" ;
}
ExtraDemo4 EPAPenDepthDemo : [ Wildcard *.h *.cpp ] ;

29
Demos/Jamfile
View File

@ -17,39 +17,10 @@ if $(GLUT.AVAILABLE) = "yes"
"../../src" ;
}
#some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTBullet GIMPACT colladadom libxml bulletopenglsupport convexdecomposition bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/ConvexDecomposition ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include ]
[ FIncludes $(TOP)/Extras/COLLADA_DOM/include/1.4 ]
[ FIncludes $(TOP)/Extras/LibXML ]
[ FIncludes $(TOP)/Extras/LibXML/include ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/ConvexDecomposition"
"../../Extras/COLLADA_DOM/include"
"../../Extras/COLLADA_DOM/include/1.4"
"../../Extras/LibXML"
"../../Extras/LibXML/include" ;
}
}
else
{
rule BulletDemo
{
}
}
rule BulletBasicDemo

22
Demos/MovingConcaveDemo/Jamfile
View File

@ -1,3 +1,23 @@
SubDir TOP Demos MovingConcaveDemo ;
ExtraDemo MovingConcaveDemo : [ Wildcard *.h *.cpp ] ;
#some demos need extra functionality, Collada / ConvexDecomposition etc.
rule ExtraDemo1
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GIMPACTBullet GIMPACT bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/GIMPACT/include ]
[ FIncludes $(TOP)/Extras/GIMPACTBullet ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/GIMPACT/include"
"../../Extras/GIMPACTBullet" ;
}
ExtraDemo1 MovingConcaveDemo : [ Wildcard *.h *.cpp ] ;

7
Extras/COLLADA_DOM/Jamfile
View File

@ -1,8 +1,9 @@
SubDir TOP Extras COLLADA_DOM ;
IncludeDir Extras/COLLADA_DOM/include ;
IncludeDir Extras/COLLADA_DOM/include/1.4 ;
IncludeDir Extras/LibXML/include ;
#IncludeDir Extras/COLLADA_DOM/include ;
#IncludeDir Extras/COLLADA_DOM/include/1.4 ;
#IncludeDir Extras/LibXML/include ;
Library colladadom :
[ Wildcard src/dae : *.h *.cpp ]

5
Extras/ConvexDecomposition/Jamfile
View File

@ -1,10 +1,13 @@
SubDir TOP Extras ConvexDecomposition ;
IncludeDir Extras/ConvexDecomposition ;
Library convexdecomposition : [ Wildcard *.h *.cpp ] ;
CFlags convexdecomposition : [ FIncludes $(TOP)/Extras/Decomposition ] ;
LibDepends convexdecomposition : ;
MsvcGenConfig ConvexDecomposition.INCDIRS : $(TOP)/Extras/ConvexDecomposition ;
InstallHeader [ Wildcard *.h ] : ConvexDecomposition ;

3
Extras/GPUphysics/GPU_physics.h
View File

@ -88,15 +88,16 @@
#include <float.h>
#include <errno.h>
#include <GL/glew.h>
#if defined(GPUP_MAC_OSX) && !defined (VMDMESA)
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <GLUT/glut.h>
#include <OpenGL/glext.h>
#else
#include <GL/glut.h>
#include <GL/gl.h>
#include <GL/glew.h>
#endif
#ifdef DISABLE_GL_ERROR_CHECKS

3
Extras/GPUphysics/GPU_physics_demo.cpp
View File

@ -164,7 +164,10 @@ void initGLcontext ( int argc, char **argv,
glutKeyboardFunc ( keybd ) ;
glutReshapeFunc ( reshape ) ;
#if defined(GPUP_MAC_OSX) && !defined (VMDMESA)
#else
glewInit () ;
#endif
checkVertexTextureSupport ( disableVertexTextureSupport ) ;
}

8
Extras/GPUphysics/Jamfile
View File

@ -6,18 +6,16 @@ if $(GLUT.AVAILABLE) = "yes"
rule GPUDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : GLUT ;
# LinkWith $(<) : GLUT ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ]
[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../Extras/PhysicsInterface/CcdPhysics"
"../../Extras/PhysicsInterface/Common" ;
ExternalLibs $(<) : GLUT GLEW ;
ExternalLibs GPUphysics : GLUT ;
}
}

2
Extras/GPUphysics/Makefile.Mac
View File

@ -3,7 +3,7 @@ HDRS = fboSupport.h shaderSupport.h
OBJS = GPU_physics_demo.o fboSupport.o shaderSupport.o clock.o
all: ${OBJS}
g++ -framework GLUT -framework OpenGL -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGL -lGLU -o GPU_physics_demo ${OBJS} -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGLU -lGLEW -lGL -lGLU -lobjc
g++ -framework GLUT -framework OpenGL -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGL -lGLU -o GPU_physics_demo ${OBJS} -L"/System/Library/Frameworks/OpenGL.framework/Libraries" -lGLU -lGL -lGLU -lobjc
shaderSupport.o : shaderSupport.cpp ${HDRS}
g++ -c shaderSupport.cpp

2
Extras/Jamfile
View File

@ -11,4 +11,4 @@ SubInclude TOP Extras GIMPACT ;
SubInclude TOP Extras GIMPACTBullet ;
#GPUphysics needs 'make', not jam compatible build yet:
#SubInclude TOP Extras GPUphysics ;
SubInclude TOP Extras GPUphysics ;

14
Extras/quickstep/Jamfile
View File

@ -1,10 +1,20 @@
SubDir TOP Extras quickstep ;
IncludeDir Extras/quickstep ;
#this is a bad global
#IncludeDir Extras/quickstep ;
Library quickstep : [ Wildcard *.h *.cpp ] ;
#internal header path to compile quickstep
CFlags quickstep : [ FIncludes $(TOP)/Extras/quickstep ] ;
LibDepends quickstep : ;
#expose header include path for apps that depend on quickstep
#QUICKSTEP.CFLAGS = [ FIncludes $(TOP)/Extras/quickstep ] ;
#same for msvcgen
MsvcGenConfig QUICKSTEP.INCDIRS : $(TOP)/Extras/quickstep ;
#for the include paths
LibDepends quickstep : BulletDynamics ;
InstallHeader [ Wildcard *.h ] : quickstep ;