From f689a5e7cef9d4c0d91f95e23ca7a8a50a8e1bdc Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Fri, 10 Sep 2010 00:14:23 +0000
Subject: [PATCH] tweaks in the build system for unix/GLEW, see also
 http://code.google.com/p/bullet/issues/detail?id=421

---
 Demos/ParticlesOpenCL/NVidia/CMakeLists.txt   | 22 +++++++++++--------
 .../btParticlesDemoDynamicsWorld.cpp          |  1 +
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt b/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
index c3665737c..0f85f1e87 100644
--- a/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
+++ b/Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
@@ -7,16 +7,19 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenGL
 ${NVIDIA_OPENCL_INCLUDES}
 )
 
+IF(WIN32)
+	IF (CMAKE_CL_64)
+		SET(CMAK_GLEW_LIBRARY		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib		)
+	ELSE(CMAKE_CL_64)
+		SET(CMAK_GLEW_LIBRARY		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32.lib		)
+	ENDIF(CMAKE_CL_64)
+ELSE()
+	IF(UNIX AND NOT APPLE)
+		FIND_LIBRARY(CMAK_GLEW_LIBRARY GLEW PATH /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64 )
+	ENDIF()
+ENDIF(WIN32)
 
-IF (CMAKE_CL_64)
-	SET(CMAK_GLEW_LIBRARY		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64.lib		)
-ELSE(CMAKE_CL_64)
-	SET(CMAK_GLEW_LIBRARY		${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32.lib		)
-ENDIF(CMAKE_CL_64)
-
-IF(UNIX AND NOT APPLE)
-	SET(CMAK_GLEW_LIBRARY		/usr/lib/libGLEW.so		)
-ENDIF()
+IF(CMAK_GLEW_LIBRARY)
 
 IF (USE_GLUT)
 	LINK_LIBRARIES(
@@ -80,3 +83,4 @@ IF (UNIX)
   TARGET_LINK_LIBRARIES(AppParticlesOCL_Nv pthread)
 ENDIF(UNIX)
 
+ENDIF(CMAK_GLEW_LIBRARY)
diff --git a/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp b/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
index 728cc94bf..46045b639 100644
--- a/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
+++ b/Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
@@ -356,6 +356,7 @@ void btParticlesDynamicsWorld::initCLKernels(int argc, char** argv)
 
 #ifdef LOAD_FROM_MEMORY
 	program_length = strlen(source);
+	printf("OpenCL compiles ParticlesOCL.cl ... ");
 #else
 
 	char* fileName = "ParticlesOCL.cl";