mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-15 06:00:12 +00:00
updated makefile and fixed a GLuint <-> int conversion issue
This commit is contained in:
parent
a7eca49065
commit
9b01b6672e
@ -729,7 +729,7 @@ double tall=ck.getDeltaTime () ;
|
||||
|
||||
if ( firsttime )
|
||||
{
|
||||
glGenQueriesARB ( 1, & query ) ;
|
||||
glGenQueriesARB ( 1, (GLuint*) & query ) ;
|
||||
firsttime = false ;
|
||||
}
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
|
||||
HDRS = fboSupport.h shaderSupport.h
|
||||
OBJS = GPU_physics_demo.o fboSupport.o shaderSupport.o
|
||||
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
|
||||
@ -14,6 +14,9 @@ fboSupport.o : fboSupport.cpp ${HDRS}
|
||||
GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
|
||||
g++ -c GPU_physics_demo.cpp
|
||||
|
||||
clock.o : clock.cpp
|
||||
g++ -c clock.cpp
|
||||
|
||||
clean:
|
||||
-rm -f ${OBJS}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user