From 9b01b6672e588eff28d8b6e723ee9db285adbdcf Mon Sep 17 00:00:00 2001
From: ejcoumans <ejcoumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Sun, 1 Oct 2006 17:16:02 +0000
Subject: [PATCH] updated makefile and fixed a GLuint <-> int conversion issue

---
 Extras/GPUphysics/GPU_physics_demo.cpp | 2 +-
 Extras/GPUphysics/Makefile.Mac         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Extras/GPUphysics/GPU_physics_demo.cpp b/Extras/GPUphysics/GPU_physics_demo.cpp
index a55b6d4ef..b4dd7a776 100644
--- a/Extras/GPUphysics/GPU_physics_demo.cpp
+++ b/Extras/GPUphysics/GPU_physics_demo.cpp
@@ -729,7 +729,7 @@ double tall=ck.getDeltaTime () ;
 
   if ( firsttime )
   {
-    glGenQueriesARB ( 1, & query ) ;
+    glGenQueriesARB ( 1, (GLuint*) & query ) ;
     firsttime = false ;
   }
 
diff --git a/Extras/GPUphysics/Makefile.Mac b/Extras/GPUphysics/Makefile.Mac
index 78c3e897c..ead9845eb 100644
--- a/Extras/GPUphysics/Makefile.Mac
+++ b/Extras/GPUphysics/Makefile.Mac
@@ -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}