diff --git a/CMakeLists.txt b/CMakeLists.txt index c7e65a136..38e3f59a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,13 +134,19 @@ IF(MSVC) #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) + SET(CMAKE_ATISTREAMSDK_LIBRARY ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib ) 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() OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF) ENDIF() @@ -193,6 +199,23 @@ IF (MSVC OR APPLE) ELSE() 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_ICD_CFG intelocl64.icd /etc/OpenCL/vendors) FIND_LIBRARY(INTEL_OPENCL_LIBRARIES OpenCL PATH /usr/lib64) diff --git a/Demos/OpenCLClothDemo/AMD/CMakeLists.txt b/Demos/OpenCLClothDemo/AMD/CMakeLists.txt index dcba3c8f5..cd73354bd 100644 --- a/Demos/OpenCLClothDemo/AMD/CMakeLists.txt +++ b/Demos/OpenCLClothDemo/AMD/CMakeLists.txt @@ -32,13 +32,13 @@ IF (USE_GLUT) BulletCollision LinearMath ${GLUT_glut_LIBRARY} - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} - ${CMAK_GLEW_LIBRARY} - ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib - ) - - + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${CMAK_GLEW_LIBRARY} + ${CMAKE_ATISTREAMSDK_LIBRARY} + ) + + ADD_EXECUTABLE(AppOpenCLClothDemo_AMD ../cl_cloth_demo.cpp ${BULLET_PHYSICS_SOURCE_DIR}/Demos/SharedOpenCL/btOpenCLUtils.cpp @@ -80,7 +80,7 @@ IF (UNIX) ENDIF(UNIX) IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) - SET_TARGET_PROPERTIES(AppOpenCLClothDemo_AMD PROPERTIES DEBUG_POSTFIX "_Debug") - SET_TARGET_PROPERTIES(AppOpenCLClothDemo_AMD PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") - SET_TARGET_PROPERTIES(AppOpenCLClothDemo_AMD PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") -ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file + SET_TARGET_PROPERTIES(AppOpenCLClothDemo_AMD PROPERTIES DEBUG_POSTFIX "_Debug") + SET_TARGET_PROPERTIES(AppOpenCLClothDemo_AMD PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") + SET_TARGET_PROPERTIES(AppOpenCLClothDemo_AMD PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/Demos/ParticlesOpenCL/AMD/CMakeLists.txt b/Demos/ParticlesOpenCL/AMD/CMakeLists.txt index 657d1efc0..972fb50c9 100644 --- a/Demos/ParticlesOpenCL/AMD/CMakeLists.txt +++ b/Demos/ParticlesOpenCL/AMD/CMakeLists.txt @@ -8,35 +8,35 @@ ${AMD_OPENCL_INCLUDES} ) ADD_DEFINITIONS(-DUSE_AMD_OPENCL) -ADD_DEFINITIONS(-DCL_PLATFORM_AMD) - -IF(WIN32) -ADD_DEFINITIONS(-DGLEW_STATIC) -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) - LINK_LIBRARIES( - OpenGLSupport +ADD_DEFINITIONS(-DCL_PLATFORM_AMD) + +IF(WIN32) + ADD_DEFINITIONS(-DGLEW_STATIC) + 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() + SET(CMAK_GLEW_LIBRARY GLEW) +endIF(WIN32) + +IF (USE_GLUT) + LINK_LIBRARIES( + OpenGLSupport BulletDynamics BulletCollision BulletMultiThreaded LinearMath ${GLUT_glut_LIBRARY} - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} - ${CMAK_GLEW_LIBRARY} - ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib - ) - - + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${CMAK_GLEW_LIBRARY} + ${CMAKE_ATISTREAMSDK_LIBRARY} + ) + + ADD_EXECUTABLE(AppParticlesOCL_AMD ${BULLET_PHYSICS_SOURCE_DIR}/Demos/ParticlesOpenCL/btParticlesDynamicsWorld.h ${BULLET_PHYSICS_SOURCE_DIR}/Demos/ParticlesOpenCL/btParticlesSharedDefs.h @@ -80,7 +80,7 @@ IF (UNIX) ENDIF(UNIX) IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) - SET_TARGET_PROPERTIES(AppParticlesOCL_AMD PROPERTIES DEBUG_POSTFIX "_Debug") - SET_TARGET_PROPERTIES(AppParticlesOCL_AMD PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") - SET_TARGET_PROPERTIES(AppParticlesOCL_AMD PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") -ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file + SET_TARGET_PROPERTIES(AppParticlesOCL_AMD PROPERTIES DEBUG_POSTFIX "_Debug") + SET_TARGET_PROPERTIES(AppParticlesOCL_AMD PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") + SET_TARGET_PROPERTIES(AppParticlesOCL_AMD PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/Demos/SerializeDemo/AMD/CMakeLists.txt b/Demos/SerializeDemo/AMD/CMakeLists.txt index d154a13c8..736c3c45f 100644 --- a/Demos/SerializeDemo/AMD/CMakeLists.txt +++ b/Demos/SerializeDemo/AMD/CMakeLists.txt @@ -14,20 +14,13 @@ ADD_DEFINITIONS(-DUSE_AMD_OPENCL) ADD_DEFINITIONS(-DCL_PLATFORM_AMD) IF(WIN32) -ADD_DEFINITIONS(-DGLEW_STATIC) -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) - LINK_LIBRARIES( - OpenGLSupport +ADD_DEFINITIONS(-DGLEW_STATIC) +ENDIF(WIN32) + + +IF (USE_GLUT) + LINK_LIBRARIES( + OpenGLSupport BulletWorldImporter BulletSoftBody BulletDynamics @@ -37,13 +30,13 @@ IF (USE_GLUT) BulletSoftBodySolvers_OpenCL_AMD BulletMultiThreaded ${GLUT_glut_LIBRARY} - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} - ${CMAK_GLEW_LIBRARY} - ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib - ) - - IF (WIN32) + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${CMAK_GLEW_LIBRARY} + ${CMAKE_ATISTREAMSDK_LIBRARY} + ) + + IF (WIN32) ADD_EXECUTABLE(AppSerializeDemo_AMD ../main.cpp ../SerializeDemo.cpp @@ -96,14 +89,14 @@ ELSE (USE_GLUT) BulletFileLoader LinearMath BulletSoftBodySolvers_OpenCL_AMD - BulletMultiThreaded - ${OPENGL_gl_LIBRARY} - ${OPENGL_glu_LIBRARY} - ${CMAK_GLEW_LIBRARY} - ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib - ) - - ADD_EXECUTABLE(AppSerializeDemo_AMD + BulletMultiThreaded + ${OPENGL_gl_LIBRARY} + ${OPENGL_glu_LIBRARY} + ${CMAKE_GLEW_LIBRARY} + ${CMAKE_ATISTREAMSDK_LIBRARY} + ) + + ADD_EXECUTABLE(AppSerializeDemo_AMD WIN32 ../../OpenGL/Win32AppMain.cpp ../Win32SerializeDemo.cpp diff --git a/Demos/SharedOpenCL/btOpenCLInclude.h b/Demos/SharedOpenCL/btOpenCLInclude.h index 830d6277b..858b52686 100644 --- a/Demos/SharedOpenCL/btOpenCLInclude.h +++ b/Demos/SharedOpenCL/btOpenCLInclude.h @@ -25,15 +25,13 @@ subject to the following restrictions: #endif #else #ifdef USE_MINICL -#include -#else -#include -#ifdef _WIN32 -#include "CL/cl_gl.h" -#endif //_WIN32 -#endif -#endif //__APPLE__ - +#include +#else +#include +#include +#endif +#endif //__APPLE__ + #include #include #define oclCHECKERROR(a, b) if((a)!=(b)) { printf("OCL Error : %d\n", (a)); assert((a) == (b)); } diff --git a/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt b/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt index 68fcf19bc..0b6e7ecca 100644 --- a/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt +++ b/Demos/VectorAdd_OpenCL/AMD/CMakeLists.txt @@ -4,13 +4,13 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src ${AMD_OPENCL_INCLUDES} ) - -LINK_LIBRARIES( - BulletMultiThreaded LinearMath - ${CMAKE_ATISTREAMSDK_LIBPATH}/OpenCL.lib -) - -ADD_EXECUTABLE(AppVectorAdd_AMD + +LINK_LIBRARIES( + BulletMultiThreaded LinearMath + ${CMAKE_ATISTREAMSDK_LIBRARY} +) + +ADD_EXECUTABLE(AppVectorAdd_AMD ../MiniCL_VectorAdd.cpp ../VectorAddKernels.cl ) @@ -28,7 +28,7 @@ IF (NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) ENDIF() IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) - SET_TARGET_PROPERTIES(AppVectorAdd_AMD PROPERTIES DEBUG_POSTFIX "_Debug") - SET_TARGET_PROPERTIES(AppVectorAdd_AMD PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") - SET_TARGET_PROPERTIES(AppVectorAdd_AMD PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") -ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file + SET_TARGET_PROPERTIES(AppVectorAdd_AMD PROPERTIES DEBUG_POSTFIX "_Debug") + SET_TARGET_PROPERTIES(AppVectorAdd_AMD PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") + SET_TARGET_PROPERTIES(AppVectorAdd_AMD PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)