Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tweaks in the build system for unix/GLEW, see also http://code.google.com/p/bullet/issues/detail?id=421

Browse Source
This commit is contained in:
erwin.coumans
2010-09-10 00:14:23 +00:00
parent 5b34356c43
commit f689a5e7ce
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Demos/ParticlesOpenCL/NVidia/CMakeLists.txt
View File

@@ -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)

1
Demos/ParticlesOpenCL/btParticlesDemoDynamicsWorld.cpp
View File

@@ -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";