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 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}/bullet_logo.png ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/atiFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
) )
IF (UNIX) IF (UNIX)

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

@@ -75,8 +75,7 @@ ENDIF(CMAKE_CL_64)
ENDIF(WIN32) ENDIF(WIN32)
IF(NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES) IF(NOT INTERNAL_CREATE_DISTRIBUTABLE_MSVC_PROJECTFILES)
ADD_CUSTOM_COMMAND( TARGET AppOpenCLClothDemo_NVidia POST_BUILD 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}/bullet_logo.png ${CMAKE_CURRENT_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${BULLET_PHYSICS_SOURCE_DIR}/Demos/OpenCLClothDemo/atiFlag.bmp ${CMAKE_CURRENT_BINARY_DIR}
) )
ENDIF() ENDIF()
IF (UNIX) IF (UNIX)

2
Demos/OpenCLClothDemo/cl_cloth_demo.cpp
View File

@@ -20,10 +20,12 @@ subject to the following restrictions:
#ifndef USE_MINICL #ifndef USE_MINICL
#define USE_SIMDAWARE_SOLVER #define USE_SIMDAWARE_SOLVER
#ifndef __APPLE__
#define USE_GPU_SOLVER #define USE_GPU_SOLVER
#if defined (_WIN32) #if defined (_WIN32)
#define USE_GPU_COPY //only tested on Windows #define USE_GPU_COPY //only tested on Windows
#endif //_WIN32 #endif //_WIN32
#endif //__APPLE__
#endif //USE_MINICL #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; cl_device_type deviceType = CL_DEVICE_TYPE_GPU;
#else #else
#ifdef __APPLE__ #ifdef __APPLE__
cl_device_type deviceType = CL_DEVICE_TYPE_GPU; cl_device_type deviceType = CL_DEVICE_TYPE_ALL;//GPU;
#else #else
cl_device_type deviceType = CL_DEVICE_TYPE_CPU;//CL_DEVICE_TYPE_ALL cl_device_type deviceType = CL_DEVICE_TYPE_CPU;//CL_DEVICE_TYPE_ALL
#endif//__APPLE__ #endif//__APPLE__

1
Demos/premake4.lua
View File

@@ -18,6 +18,7 @@ function createDemos( demos, incdirs, linknames)
files { "../msvc/bullet.rc" } files { "../msvc/bullet.rc" }
configuration {"MaxOSX"} configuration {"MaxOSX"}
print "hello"
linkoptions { "-framework Carbon -framework OpenGL -framework AGL -framework Glut" } linkoptions { "-framework Carbon -framework OpenGL -framework AGL -framework Glut" }
configuration {"not Windows", "not MacOSX"} configuration {"not Windows", "not MacOSX"}

15
msvc/nacl.sh
View File

@@ -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

8
msvc/vs2008_nacl.bat
View File

@@ -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