mirror of
https://github.com/bulletphysics/bullet3
synced 2025-01-07 08:10:08 +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 )
|
if ( firsttime )
|
||||||
{
|
{
|
||||||
glGenQueriesARB ( 1, & query ) ;
|
glGenQueriesARB ( 1, (GLuint*) & query ) ;
|
||||||
firsttime = false ;
|
firsttime = false ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
HDRS = fboSupport.h shaderSupport.h
|
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}
|
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 -lGLEW -lGL -lGLU -lobjc
|
||||||
@ -14,6 +14,9 @@ fboSupport.o : fboSupport.cpp ${HDRS}
|
|||||||
GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
|
GPU_physics_demo.o : GPU_physics_demo.cpp ${HDRS}
|
||||||
g++ -c GPU_physics_demo.cpp
|
g++ -c GPU_physics_demo.cpp
|
||||||
|
|
||||||
|
clock.o : clock.cpp
|
||||||
|
g++ -c clock.cpp
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
-rm -f ${OBJS}
|
-rm -f ${OBJS}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user