Permalink
Browse files

Bring Bullet 2.81 to BlackBerry with support for NEON optimizations.

  • Loading branch information...
1 parent f3c9586 commit cd3e3b983a1b8370d35103c97ee338958bb9e783 @kwhatmough kwhatmough committed Oct 25, 2012
Showing 2,514 changed files with 195,139 additions and 402,690 deletions.
View
@@ -29,12 +29,16 @@
<option id="com.qnx.qcc.option.compiler.security.314368063" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.582639440" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
+ <listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.796134610" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/qnx6/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.ccoptions.1742615649" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-mfpu=neon"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.394065364" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.450648636" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -89,12 +93,16 @@
<option id="com.qnx.qcc.option.compiler.security.818314516" name="Enhanced Security (-fstack-protector-all)" superClass="com.qnx.qcc.option.compiler.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.compiler.defines.604144028" name="Defines (-D)" superClass="com.qnx.qcc.option.compiler.defines" valueType="definedSymbols">
<listOptionValue builtIn="false" value="_FORTIFY_SOURCE=2"/>
+ <listOptionValue builtIn="false" value="BT_USE_NEON"/>
</option>
<option id="com.qnx.qcc.option.compiler.includePath.1752144234" name="Include Directories (-I)" superClass="com.qnx.qcc.option.compiler.includePath" valueType="includePath">
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/qnx6/usr/include/freetype2"/>
<listOptionValue builtIn="false" value="C:/bbndk-2.0.1/target/target-override/usr/include"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
</option>
+ <option id="com.qnx.qcc.option.compiler.ccoptions.564956055" superClass="com.qnx.qcc.option.compiler.ccoptions" valueType="stringList">
+ <listOptionValue builtIn="false" value="-mfpu=neon"/>
+ </option>
<inputType id="com.qnx.qcc.inputType.compiler.1298308727" superClass="com.qnx.qcc.inputType.compiler"/>
</tool>
<tool id="com.qnx.qcc.tool.assembler.2087027974" name="QCC Assembler" superClass="com.qnx.qcc.tool.assembler">
@@ -224,7 +232,7 @@
</tool>
<tool id="com.qnx.qcc.tool.linker.15318533" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.debug.145981878" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
- <option id="com.qnx.qcc.option.linker.coverage.1282711406" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs -p)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.linker.coverage.1282711406" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.54367545" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.security.534776782" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.874171582" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
@@ -405,7 +413,7 @@
</tool>
<tool id="com.qnx.qcc.tool.linker.1182781" name="QCC Linker" superClass="com.qnx.qcc.tool.linker">
<option id="com.qnx.qcc.option.linker.debug.1365299618" name="Debug (-g)" superClass="com.qnx.qcc.option.linker.debug" value="true" valueType="boolean"/>
- <option id="com.qnx.qcc.option.linker.coverage.2102294719" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs -p)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
+ <option id="com.qnx.qcc.option.linker.coverage.2102294719" name="Build for Code Coverage (-ftest-coverage -fprofile-arcs)" superClass="com.qnx.qcc.option.linker.coverage" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.langcpp.687486021" name="C++ (-lang-c++)" superClass="com.qnx.qcc.option.linker.langcpp" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.security.311673728" name="Enhanced Security (-Wl,-z,relro -Wl,-z,now)" superClass="com.qnx.qcc.option.linker.security" value="true" valueType="boolean"/>
<option id="com.qnx.qcc.option.linker.libraryPaths.150381602" name="Library Paths (-L)" superClass="com.qnx.qcc.option.linker.libraryPaths" valueType="libPaths">
View
@@ -5,7 +5,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
SET(MSVC_INCREMENTAL_DEFAULT ON)
PROJECT(BULLET_PHYSICS)
-SET(BULLET_VERSION 2.80)
+SET(BULLET_VERSION 2.81)
IF(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
@@ -22,11 +22,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
OPTION(USE_DOUBLE_PRECISION "Use double precision" OFF)
OPTION(USE_GRAPHICAL_BENCHMARK "Use Graphical Benchmark" ON)
-OPTION(USE_MULTITHREADED_BENCHMARK "Use Multithreaded Benchmark" OFF)
-IF (USE_MULTITHREADED_BENCHMARK)
- ADD_DEFINITIONS(-DUSE_PARALLEL_SOLVER_BENCHMARK -DUSE_PARALLEL_DISPATCHER_BENCHMARK)
-ENDIF()
OPTION(USE_MSVC_RUNTIME_LIBRARY_DLL "Use MSVC Runtime Library DLL (/MD or /MDd)" OFF)
OPTION(USE_MSVC_INCREMENTAL_LINKING "Use MSVC Incremental Linking" OFF)
@@ -42,14 +38,141 @@ IF (USE_CUSTOM_VECTOR_MATH)
ENDIF(WIN32)
ENDIF(USE_CUSTOM_VECTOR_MATH)
-IF (MSVC)
- FIND_PATH(DIRECTX_SDK_BASE_DIR Include/D3D11.h PATH $ENV{DXSDK_DIR} )
- IF(DIRECTX_SDK_BASE_DIR)
- OPTION(USE_DX11 "Use DirectX 11" ON)
+
+IF (APPLE OR MSVC)
+ OPTION(BUILD_MULTITHREADING "Use BulletMultiThreading" ON)
+ELSE()
+ OPTION(BUILD_MULTITHREADING "Use BulletMultiThreading" OFF)
+ENDIF()
+
+IF (BUILD_MULTITHREADING)
+ OPTION(USE_MULTITHREADED_BENCHMARK "Use Multithreaded Benchmark" OFF)
+ IF (USE_MULTITHREADED_BENCHMARK)
+ ADD_DEFINITIONS(-DUSE_PARALLEL_SOLVER_BENCHMARK -DUSE_PARALLEL_DISPATCHER_BENCHMARK)
+ ENDIF(USE_MULTITHREADED_BENCHMARK)
+
+ IF (MSVC OR APPLE)
+ OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" ON)
ELSE()
- OPTION(USE_DX11 "Use DirectX 11" OFF)
- ENDIF()
-ENDIF(MSVC)
+ OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF)
+ ENDIF(MSVC OR APPLE)
+
+ IF(MSVC)
+ FIND_PATH(DIRECTX_SDK_BASE_DIR Include/D3D11.h PATH $ENV{DXSDK_DIR} )
+ IF(DIRECTX_SDK_BASE_DIR)
+ OPTION(USE_DX11 "Use DirectX 11" ON)
+ ELSE()
+ OPTION(USE_DX11 "Use DirectX 11" OFF)
+ ENDIF()
+
+ 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")
+ 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()
+
+ FIND_PATH(INTEL_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{INTELOCLSDKROOT} )
+ IF(INTEL_OPENCL_BASE_DIR)
+ SET(INTEL_OPENCL_INCLUDES ${INTEL_OPENCL_BASE_DIR}/include )
+ MESSAGE("INTEL OPENCL SDK FOUND")
+ MESSAGE(${INTEL_OPENCL_INCLUDES})
+ IF (CMAKE_CL_64)
+ SET(CMAKE_INTELOCLSDK_LIBPATH ${INTEL_OPENCL_BASE_DIR}/lib/x64 )
+ ELSE(CMAKE_CL_64)
+ SET(CMAKE_INTELOCLSDK_LIBPATH ${INTEL_OPENCL_BASE_DIR}/lib/x86 )
+ ENDIF(CMAKE_CL_64)
+ SET(INTEL_OPENCL_LIBRARIES ${CMAKE_INTELOCLSDK_LIBPATH}/OpenCL.lib)
+ OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" ON)
+ ELSE()
+ OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" OFF)
+ ENDIF()
+
+ FIND_PATH(NVIDIA_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{CUDA_PATH} )
+ IF(NVIDIA_OPENCL_BASE_DIR)
+ SET(NVIDIA_OPENCL_INCLUDES ${NVIDIA_OPENCL_BASE_DIR}/include )
+ MESSAGE("NVIDIA OPENCL SDK FOUND")
+ MESSAGE(${NVIDIA_OPENCL_INCLUDES})
+ IF (CMAKE_CL_64)
+ SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/x64 )
+ ELSE(CMAKE_CL_64)
+ SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/Win32 )
+ ENDIF(CMAKE_CL_64)
+ SET(NVIDIA_OPENCL_LIBRARIES ${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)
+
+ OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON)
+ ELSE()
+ OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" OFF)
+ ENDIF()
+ ELSE(MSVC)
+ 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(AMD_OPENCL_BASE_DIR)
+
+ 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)
+ IF (INTEL_OPENCL_INCLUDES AND INTEL_OPENCL_LIBRARIES AND INTEL_OPENCL_ICD_CFG)
+ MESSAGE("INTEL OPENCL SDK FOUND")
+ MESSAGE(${INTEL_OPENCL_LIBRARIES})
+ OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" ON)
+ ELSE ()
+ MESSAGE("INTEL OPENCL NOT FOUND")
+ OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" OFF)
+ ENDIF ()
+
+
+ FIND_PATH(NVIDIA_OPENCL_INCLUDES CL/cl.h)
+ FIND_PATH(NVIDIA_OPENCL_ICD_CFG nvidia.icd /etc/OpenCL/vendors)
+ FIND_LIBRARY(NVIDIA_OPENCL_LIBRARIES OpenCL PATH /usr/lib64 /usr/local/lib)
+ IF (NVIDIA_OPENCL_INCLUDES AND NVIDIA_OPENCL_LIBRARIES AND NVIDIA_OPENCL_ICD_CFG)
+ MESSAGE("NVidia OPENCL FOUND")
+ MESSAGE(${NVIDIA_OPENCL_LIBRARIES})
+ OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON)
+ ELSE ()
+ MESSAGE("NVidia OPENCL NOT FOUND")
+ OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" OFF)
+ ENDIF ()
+ ENDIF(MSVC)
+
+ELSE(BUILD_MULTITHREADING)
+# SET(BUILD_NVIDIA_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for NVidia" FORCE)
+# SET(BUILD_AMD_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for AMD" FORCE)
+# SET(BUILD_INTEL_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for Intel (CPU)" FORCE)
+# SET(BUILD_MINICL_OPENCL_DEMOS OFF CACHE BOOL "Build OpenCL demos for MiniCL (Generic CPU)" FORCE)
+# SET(USE_DX11 OFF CACHE BOOL "Use DirectX 11" FORCE)
+# SET(USE_MULTITHREADED_BENCHMARK OFF CACHE BOOL "Use Multithreaded Benchmark" FORCE)
+ENDIF(BUILD_MULTITHREADING)
+
+
#SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO")
@@ -128,57 +251,6 @@ SET(CMAKE_RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo" CACHE STRING "Adds a postfi
-IF(MSVC)
- 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)
- ELSE()
- OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" OFF)
- ENDIF()
-
- FIND_PATH(INTEL_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{INTELOCLSDKROOT} )
- IF(INTEL_OPENCL_BASE_DIR)
- SET(INTEL_OPENCL_INCLUDES ${INTEL_OPENCL_BASE_DIR}/include )
- MESSAGE("INTEL OPENCL SDK FOUND")
- MESSAGE(${INTEL_OPENCL_INCLUDES})
- IF (CMAKE_CL_64)
- SET(CMAKE_INTELOCLSDK_LIBPATH ${INTEL_OPENCL_BASE_DIR}/lib/x64 )
- ELSE(CMAKE_CL_64)
- SET(CMAKE_INTELOCLSDK_LIBPATH ${INTEL_OPENCL_BASE_DIR}/lib/x86 )
- ENDIF(CMAKE_CL_64)
- SET(INTEL_OPENCL_LIBRARIES ${CMAKE_INTELOCLSDK_LIBPATH}/OpenCL.lib)
- OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" ON)
- ELSE()
- OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" OFF)
- ENDIF()
-
- FIND_PATH(NVIDIA_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{CUDA_PATH} )
- IF(NVIDIA_OPENCL_BASE_DIR)
- SET(NVIDIA_OPENCL_INCLUDES ${NVIDIA_OPENCL_BASE_DIR}/include )
- MESSAGE("NVIDIA OPENCL SDK FOUND")
- MESSAGE(${NVIDIA_OPENCL_INCLUDES})
- IF (CMAKE_CL_64)
- SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/x64 )
- ELSE(CMAKE_CL_64)
- SET(CMAKE_NVSDKCOMPUTE_LIBPATH ${NVIDIA_OPENCL_BASE_DIR}/lib/Win32 )
- ENDIF(CMAKE_CL_64)
- SET(NVIDIA_OPENCL_LIBRARIES ${CMAKE_NVSDKCOMPUTE_LIBPATH}/OpenCL.lib)
-
- OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON)
- ELSE()
- OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" OFF)
- ENDIF()
-ENDIF()
-
IF (INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
@@ -188,36 +260,6 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
ENDIF (WIN32)
-IF (MSVC OR APPLE)
- OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" ON)
-ELSE()
- OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF)
-
- 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)
- IF (INTEL_OPENCL_INCLUDES AND INTEL_OPENCL_LIBRARIES AND INTEL_OPENCL_ICD_CFG)
- MESSAGE("INTEL OPENCL SDK FOUND")
- MESSAGE(${INTEL_OPENCL_LIBRARIES})
- OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" ON)
- ELSE ()
- MESSAGE("INTEL OPENCL NOT FOUND")
- OPTION(BUILD_INTEL_OPENCL_DEMOS "Build OpenCL demos for Intel (CPU)" OFF)
- ENDIF ()
-
- FIND_PATH(NVIDIA_OPENCL_INCLUDES CL/cl.h)
- FIND_PATH(NVIDIA_OPENCL_ICD_CFG nvidia.icd /etc/OpenCL/vendors)
- FIND_LIBRARY(NVIDIA_OPENCL_LIBRARIES OpenCL PATH /usr/lib64 /usr/local/lib)
- IF (NVIDIA_OPENCL_INCLUDES AND NVIDIA_OPENCL_LIBRARIES AND NVIDIA_OPENCL_ICD_CFG)
- MESSAGE("NVidia OPENCL FOUND")
- MESSAGE(${NVIDIA_OPENCL_LIBRARIES})
- OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" ON)
- ELSE ()
- MESSAGE("NVidia OPENCL NOT FOUND")
- OPTION(BUILD_NVIDIA_OPENCL_DEMOS "Build OpenCL demos for NVidia (GPU)" OFF)
- ENDIF ()
-
-ENDIF()
OPTION(BUILD_CPU_DEMOS "Build original Bullet CPU demos" ON)
View
@@ -4,6 +4,9 @@ Primary author and maintainer: Erwin Coumans
This ChangeLog is incomplete, for an up-to-date list of all fixed issues see http://bullet.googlecode.com
using http://tinyurl.com/yabmjjj
+2012 September 10
+ - Bullet 2.81 release preparation
+
2011 September 15
- Bullet 2.79 release, revision 2433 (mainly a bugfix release)
- Revert a change in 2.78 related to speculative contacts (it has undesired side effects)
@@ -25,7 +25,7 @@ ${VECTOR_MATH_INCLUDE}
)
LINK_LIBRARIES(
-GLUI GIMPACTUtils HACD ConvexDecomposition BulletMultiThreaded OpenGLSupport BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletFileLoader LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+GLUI GIMPACTUtils HACD ConvexDecomposition OpenGLSupport BulletWorldImporter BulletSoftBody BulletDynamics BulletCollision BulletFileLoader LinearMath ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
)
SET(AllBulletDemos_SRCS
@@ -57,7 +57,7 @@ SET(AllBulletDemos_SRCS
IF (WIN32)
ADD_EXECUTABLE(AppAllBulletDemos
${AllBulletDemos_SRCS}
- ${BULLET_PHYSICS_SOURCE_DIR}/msvc/bullet.rc
+ ${BULLET_PHYSICS_SOURCE_DIR}/build/bullet.rc
)
ELSE()
ADD_EXECUTABLE(AppAllBulletDemos
Oops, something went wrong.

0 comments on commit cd3e3b9

Please sign in to comment.