Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

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