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

enable AMD OpenCL sdk for linux too

Browse Source 
Fixes Issue 641
This commit is contained in:
erwin.coumans
2012-09-12 16:42:03 +00:00
parent 9a460942a9
commit 73082e995c
6 changed files with 103 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CMakeLists.txt
View File

@@ -134,13 +134,19 @@ IF(MSVC)
#AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable #AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable
SET(AMD_OPENCL_INCLUDES ${AMD_OPENCL_BASE_DIR}/include ) SET(AMD_OPENCL_INCLUDES ${AMD_OPENCL_BASE_DIR}/include )
MESSAGE("AMD OPENCL SDK FOUND") MESSAGE("AMD OPENCL SDK FOUND")
MESSAGE(${AMD_OPENCL_INCLUDES})
IF (CMAKE_CL_64) IF (CMAKE_CL_64)
SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86_64 ) SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86_64 )
ELSE(CMAKE_CL_64) ELSE(CMAKE_CL_64)
SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86 ) SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86 )
ENDIF(CMAKE_CL_64) ENDIF(CMAKE_CL_64)
SET(CMAKE_ATISTREAMSDK_LIBRARY ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib )
OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON) OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON)
IF (CMAKE_CL_64)
SET(CMAK_GLEW_LIBRARY
${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib )
ELSE(CMAKE_CL_64)
SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib )
ENDIF(CMAKE_CL_64)
ELSE() ELSE()
OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF) OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF)
ENDIF() ENDIF()
@@ -193,6 +199,23 @@ IF (MSVC OR APPLE)
ELSE() ELSE()
OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF) OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF)
FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{ATISTREAMSDKROOT} $ENV{AMDAPPSDKROOT} )
IF(AMD_OPENCL_BASE_DIR)
#AMD adds an extras slash at the end of the ATISTREAMSDKROOT variable
SET(AMD_OPENCL_INCLUDES ${AMD_OPENCL_BASE_DIR}/include )
MESSAGE("AMD OPENCL SDK FOUND")
MESSAGE(${AMD_OPENCL_INCLUDES})
IF (CMAKE_CL_64)
SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86_64 )
ELSE(CMAKE_CL_64)
SET(CMAKE_ATISTREAMSDK_LIBPATH ${AMD_OPENCL_BASE_DIR}/lib/x86 )
ENDIF(CMAKE_CL_64)
OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON)
SET(CMAKE_ATISTREAMSDK_LIBRARY OpenCL )
ELSE()
OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF)
ENDIF()
FIND_PATH(INTEL_OPENCL_INCLUDES CL/cl.h) FIND_PATH(INTEL_OPENCL_INCLUDES CL/cl.h)
FIND_PATH(INTEL_OPENCL_ICD_CFG intelocl64.icd /etc/OpenCL/vendors) FIND_PATH(INTEL_OPENCL_ICD_CFG intelocl64.icd /etc/OpenCL/vendors)
FIND_LIBRARY(INTEL_OPENCL_LIBRARIES OpenCL PATH /usr/lib64) FIND_LIBRARY(INTEL_OPENCL_LIBRARIES OpenCL PATH /usr/lib64)

2
Demos/OpenCLClothDemo/AMD/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ IF (USE_GLUT)
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${OPENGL_glu_LIBRARY}
${CMAK_GLEW_LIBRARY} ${CMAK_GLEW_LIBRARY}
${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ${CMAKE_ATISTREAMSDK_LIBRARY}
) )

8
Demos/ParticlesOpenCL/AMD/CMakeLists.txt
View File

@@ -12,15 +12,15 @@ ADD_DEFINITIONS(-DCL_PLATFORM_AMD)
IF(WIN32) IF(WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
ENDIF(WIN32)
IF (CMAKE_CL_64) IF (CMAKE_CL_64)
SET(CMAK_GLEW_LIBRARY SET(CMAK_GLEW_LIBRARY
${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib ) ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib )
ELSE(CMAKE_CL_64) ELSE(CMAKE_CL_64)
SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib ) SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib )
ENDIF(CMAKE_CL_64) ENDIF(CMAKE_CL_64)
else()
SET(CMAK_GLEW_LIBRARY GLEW)
endIF(WIN32)
IF (USE_GLUT) IF (USE_GLUT)
LINK_LIBRARIES( LINK_LIBRARIES(
@@ -33,7 +33,7 @@ IF (USE_GLUT)
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${OPENGL_glu_LIBRARY}
${CMAK_GLEW_LIBRARY} ${CMAK_GLEW_LIBRARY}
${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ${CMAKE_ATISTREAMSDK_LIBRARY}
) )

13
Demos/SerializeDemo/AMD/CMakeLists.txt
View File

@@ -17,13 +17,6 @@ IF(WIN32)
ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS(-DGLEW_STATIC)
ENDIF(WIN32) ENDIF(WIN32)
IF (CMAKE_CL_64)
SET(CMAK_GLEW_LIBRARY
${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew64s.lib )
ELSE(CMAKE_CL_64)
SET(CMAK_GLEW_LIBRARY ${BULLET_PHYSICS_SOURCE_DIR}/Glut/glew32s.lib )
ENDIF(CMAKE_CL_64)
IF (USE_GLUT) IF (USE_GLUT)
LINK_LIBRARIES( LINK_LIBRARIES(
@@ -40,7 +33,7 @@ IF (USE_GLUT)
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${OPENGL_glu_LIBRARY}
${CMAK_GLEW_LIBRARY} ${CMAK_GLEW_LIBRARY}
${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ${CMAKE_ATISTREAMSDK_LIBRARY}
) )
IF (WIN32) IF (WIN32)
@@ -99,8 +92,8 @@ ELSE (USE_GLUT)
BulletMultiThreaded BulletMultiThreaded
${OPENGL_gl_LIBRARY} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${OPENGL_glu_LIBRARY}
${CMAK_GLEW_LIBRARY} ${CMAKE_GLEW_LIBRARY}
${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ${CMAKE_ATISTREAMSDK_LIBRARY}
) )
ADD_EXECUTABLE(AppSerializeDemo_AMD ADD_EXECUTABLE(AppSerializeDemo_AMD

4
Demos/SharedOpenCL/btOpenCLInclude.h
View File

@@ -28,9 +28,7 @@ subject to the following restrictions:
#include <MiniCL/cl.h> #include <MiniCL/cl.h>
#else #else
#include <CL/cl.h> #include <CL/cl.h>
#ifdef _WIN32 #include <CL/cl_gl.h>
#include "CL/cl_gl.h"
#endif //_WIN32
#endif #endif
#endif //__APPLE__ #endif //__APPLE__

2
Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt
View File

@@ -7,7 +7,7 @@ INCLUDE_DIRECTORIES(
LINK_LIBRARIES( LINK_LIBRARIES(
BulletMultiThreaded LinearMath BulletMultiThreaded LinearMath
${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ${CMAKE_ATISTREAMSDK_LIBRARY}
) )
ADD_EXECUTABLE(AppVectorAdd_AMD ADD_EXECUTABLE(AppVectorAdd_AMD