From 6a9e16501cdec3c6085fe23c9b1651a4287dd612 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Tue, 24 Aug 2010 21:35:28 +0000 Subject: [PATCH] Fixes to compile MiniCL under Linux. OpenCL fixes for Linux not processed yet (TBD) --- Demos/OpenCLClothDemo/cloth.h | 1 + Demos/OpenCLClothDemo/clstuff.cpp | 2 +- Demos/ParticlesOpenCL/MiniCL/CMakeLists.txt | 3 +++ .../GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Demos/OpenCLClothDemo/cloth.h b/Demos/OpenCLClothDemo/cloth.h index cce971b22..b86b2fe95 100644 --- a/Demos/OpenCLClothDemo/cloth.h +++ b/Demos/OpenCLClothDemo/cloth.h @@ -18,6 +18,7 @@ subject to the following restrictions: #include "bmpLoader.h" #include +#include #include "LinearMath/btScalar.h" diff --git a/Demos/OpenCLClothDemo/clstuff.cpp b/Demos/OpenCLClothDemo/clstuff.cpp index 0ee8b1ad4..f6e6d4017 100644 --- a/Demos/OpenCLClothDemo/clstuff.cpp +++ b/Demos/OpenCLClothDemo/clstuff.cpp @@ -13,7 +13,7 @@ subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. */ - +#include #include "clstuff.h" #include "gl_win.h" diff --git a/Demos/ParticlesOpenCL/MiniCL/CMakeLists.txt b/Demos/ParticlesOpenCL/MiniCL/CMakeLists.txt index ae1dd5e96..5255bed63 100644 --- a/Demos/ParticlesOpenCL/MiniCL/CMakeLists.txt +++ b/Demos/ParticlesOpenCL/MiniCL/CMakeLists.txt @@ -20,6 +20,9 @@ ELSE(CMAKE_CL_64) ENDIF(CMAKE_CL_64) ENDIF(WIN32) +IF(UNIX AND NOT APPLE) + SET(CMAK_GLEW_LIBRARY /usr/lib/libGLEW.so ) +ENDIF(UNIX AND NOT APPLE) IF (USE_GLUT) LINK_LIBRARIES( diff --git a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h index b023d475c..226f894fe 100644 --- a/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h +++ b/src/BulletMultiThreaded/GpuSoftBodySolvers/OpenCL/btSoftBodySolver_OpenCL.h @@ -329,4 +329,4 @@ public: virtual void copySoftBodyToVertexBuffer( const btSoftBody *const softBody, btVertexBufferDescriptor *vertexBuffer ); }; // btOpenCLSoftBodySolver -#endif #ifndef BT_SOFT_BODY_SOLVER_OPENCL_H +#endif // #ifndef BT_SOFT_BODY_SOLVER_OPENCL_H