diff --git a/Demos/OpenCLClothDemo/Apple/CMakeLists.txt b/Demos/OpenCLClothDemo/Apple/CMakeLists.txt index f9a24cf1f..629a8dffc 100644 --- a/Demos/OpenCLClothDemo/Apple/CMakeLists.txt +++ b/Demos/OpenCLClothDemo/Apple/CMakeLists.txt @@ -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) diff --git a/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt b/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt index 3c2f9ac15..2c6f12840 100644 --- a/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt +++ b/Demos/OpenCLClothDemo/NVidia/CMakeLists.txt @@ -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) \ No newline at end of file +ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/Demos/OpenCLClothDemo/cl_cloth_demo.cpp b/Demos/OpenCLClothDemo/cl_cloth_demo.cpp index 0fd5c05d8..70aaa2338 100644 --- a/Demos/OpenCLClothDemo/cl_cloth_demo.cpp +++ b/Demos/OpenCLClothDemo/cl_cloth_demo.cpp @@ -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 diff --git a/Demos/OpenCLClothDemo/clstuff.cpp b/Demos/OpenCLClothDemo/clstuff.cpp index f8b2c78b0..eedd67413 100644 --- a/Demos/OpenCLClothDemo/clstuff.cpp +++ b/Demos/OpenCLClothDemo/clstuff.cpp @@ -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__ diff --git a/Demos/premake4.lua b/Demos/premake4.lua index 17ec919bb..d05e4d361 100644 --- a/Demos/premake4.lua +++ b/Demos/premake4.lua @@ -18,6 +18,7 @@ function createDemos( demos, incdirs, linknames) files { "../msvc/bullet.rc" } configuration {"MaxOSX"} + print "hello" linkoptions { "-framework Carbon -framework OpenGL -framework AGL -framework Glut" } configuration {"not Windows", "not MacOSX"} @@ -85,4 +86,4 @@ end include "OpenGL" - \ No newline at end of file + diff --git a/msvc/nacl.sh b/msvc/nacl.sh deleted file mode 100644 index f319bf777..000000000 --- a/msvc/nacl.sh +++ /dev/null @@ -1,15 +0,0 @@ - -echo Only tested using a Cygwin Bash Shell with make.exe available - -export AR=/cygdrive/f/sdks/native_client_sdk_0_5_984/toolchain/win_x86/bin/nacl-ar.exe -export CC=/cygdrive/f/sdks/native_client_sdk_0_5_984/toolchain/win_x86/bin/nacl-gcc.exe -export CXX=/cygdrive/f/sdks/native_client_sdk_0_5_984/toolchain/win_x86/bin/nacl-g++.exe - -./premake4 --with-nacl gmake -cd gmake -export config=release32 -make - -export config=release64 -make - diff --git a/msvc/vs2008_nacl.bat b/msvc/vs2008_nacl.bat deleted file mode 100644 index 696136dbc..000000000 --- a/msvc/vs2008_nacl.bat +++ /dev/null @@ -1,8 +0,0 @@ - -rem premake4 --no-pelibs vs2008 -rem premake4 --no-pedemos vs2008 -rem premake4 --no-bulletlibs --no-pelibs vs2008 -premake4 --with-nacl vs2008 - - -pause \ No newline at end of file