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

some compile fixes for MacOSX

Browse Source
This commit is contained in:
erwin.coumans
2011-09-14 18:48:23 +00:00
parent d1eec5f5bb
commit 9abcd9cf2e
7 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Demos/OpenCLClothDemo/Apple/CMakeLists.txt
View File

@@ -48,8 +48,7 @@ ENDIF (USE_GLUT)
ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_Apple POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/amdFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/atiFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/bullet_logo.png ${CMAKE_CURRENT_BINARY_DIR}
)
IF (UNIX)

5
Demos/OpenCLClothDemo/NVidia/CMakeLists.txt
View File

@@ -75,8 +75,7 @@ ENDIF(CMAKE_CL_64)
ENDIF(WIN32)
IF(NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_NVidia POST_BUILD
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/amdFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/atiFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/bullet_logo.png ${CMAKE_CURRENT_BINARY_DIR}
)
ENDIF()
IF (UNIX)
@@ -87,4 +86,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
SET_TARGET_PROPERTIES(AppOpenCLClothDemo_NVidia PROPERTIES DEBUG_POSTFIX "_Debug")
SET_TARGET_PROPERTIES(AppOpenCLClothDemo_NVidia PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel")
SET_TARGET_PROPERTIES(AppOpenCLClothDemo_NVidia PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)

2
Demos/OpenCLClothDemo/cl_cloth_demo.cpp
View File

@@ -20,10 +20,12 @@ subject to the following restrictions:
#ifndef USE_MINICL
#define USE_SIMDAWARE_SOLVER
#ifndef __APPLE__
#define USE_GPU_SOLVER
#if defined (_WIN32)
#define USE_GPU_COPY //only tested on Windows
#endif //_WIN32
#endif //__APPLE__
#endif //USE_MINICL

2
Demos/OpenCLClothDemo/clstuff.cpp
View File

@@ -42,7 +42,7 @@ void initCL( void* glCtx, void* glDC )
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
#else
#ifdef __APPLE__
cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
cl_device_type deviceType = CL_DEVICE_TYPE_ALL;//GPU;
#else
cl_device_type deviceType = CL_DEVICE_TYPE_CPU;//CL_DEVICE_TYPE_ALL
#endif//__APPLE__