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

Collision flag CF_DISABLE_SPU_COLLISION_PROCESSING can be combined with other flags (avoids SPU/parallel collision dispatch)

Browse Source 
Fix for MinGW32 build
This commit is contained in:
erwin.coumans
2010-08-30 21:46:23 +00:00
parent 33ddc450b4
commit 44b82652d0
7 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -42,14 +42,14 @@ IF (USE_CUSTOM_VECTOR_MATH)
ENDIF(WIN32) ENDIF(WIN32)
ENDIF(USE_CUSTOM_VECTOR_MATH) ENDIF(USE_CUSTOM_VECTOR_MATH)
IF (WIN32) IF (MSVC)
FIND_PATH(DIRECTX_SDK_BASE_DIR Include/D3D11.h PATH $ENV{DXSDK_DIR} ) FIND_PATH(DIRECTX_SDK_BASE_DIR Include/D3D11.h PATH $ENV{DXSDK_DIR} )
IF(DIRECTX_SDK_BASE_DIR) IF(DIRECTX_SDK_BASE_DIR)
OPTION(USE_DX11 "Use DirectX 11" ON) OPTION(USE_DX11 "Use DirectX 11" ON)
ELSE() ELSE()
OPTION(USE_DX11 "Use DirectX 11" OFF) OPTION(USE_DX11 "Use DirectX 11" OFF)
ENDIF() ENDIF()
ENDIF(WIN32) ENDIF(MSVC)
#SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO") #SET(CMAKE_EXE_LINKER_FLAGS_INIT "/STACK:10000000 /INCREMENTAL:NO")
@@ -120,7 +120,7 @@ ENDIF()
OPTION(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES "Create MSVC projectfiles with relative paths" OFF) OPTION(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES "Create MSVC projectfiles with relative paths" OFF)
OPTION(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES "Add MSVC postfix for executable names (_Debug)" OFF) OPTION(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES "Add MSVC postfix for executable names (_Debug)" OFF)
IF(WIN32) IF(MSVC)
FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{ATISTREAMSDKROOT} ) FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH $ENV{ATISTREAMSDKROOT} )
IF(AMD_OPENCL_BASE_DIR) IF(AMD_OPENCL_BASE_DIR)
OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON) OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)" ON)
@@ -162,7 +162,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
ENDIF (WIN32) ENDIF (WIN32)
IF (WIN32 OR APPLE) IF (MSVC OR APPLE)
OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" ON) OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" ON)
ELSE() ELSE()
OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF) OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF)

1
Demos/OpenGL/GLDebugFont.cpp
View File

@@ -40,6 +40,7 @@ subject to the following restrictions:
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#else #else
#include <GL/gl.h>
#include <GL/glut.h> #include <GL/glut.h>
#endif #endif
#endif #endif

3
Demos/OpenGL/GL_DialogWindow.h
View File

@@ -33,11 +33,12 @@ class btCollisionObject;
#else #else
#ifdef _WINDOWS #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#else #else
#include <GL/gl.h>
#include <GL/glut.h> #include <GL/glut.h>
#endif #endif
#endif #endif

1
Demos/OpenGL/GlutStuff.h
View File

@@ -33,6 +33,7 @@ subject to the following restrictions:
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#else #else
#include <GL/gl.h>
#include <GL/glut.h> #include <GL/glut.h>
#endif //_WINDOWS #endif //_WINDOWS
#endif //APPLE #endif //APPLE

7
Demos/SharedOpenCL/btOclUtils.cpp
View File

@@ -130,18 +130,11 @@ char* btOclLoadProgSource(const char* cFilename, const char* cPreamble, size_t*
size_t szSourceLength; size_t szSourceLength;
// open the OpenCL source code file // open the OpenCL source code file
#ifdef _WIN32 // Windows version
if(fopen_s(&pFileStream, cFilename, "rb") != 0)
{
return NULL;
}
#else // Linux version
pFileStream = fopen(cFilename, "rb"); pFileStream = fopen(cFilename, "rb");
if(pFileStream == 0) if(pFileStream == 0)
{ {
return NULL; return NULL;
} }
#endif
size_t szPreambleLength = strlen(cPreamble); size_t szPreambleLength = strlen(cPreamble);

7
Demos/VectorAdd_OpenCL/MiniCL_VectorAdd.cpp
View File

@@ -45,18 +45,11 @@ char* loadProgSource(const char* cFilename, const char* cPreamble, size_t* szFin
size_t szSourceLength; size_t szSourceLength;
// open the OpenCL source code file // open the OpenCL source code file
#ifdef _WIN32 // Windows version
if(fopen_s(&pFileStream, cFilename, "rb") != 0)
{
return NULL;
}
#else // Linux version
pFileStream = fopen(cFilename, "rb"); pFileStream = fopen(cFilename, "rb");
if(pFileStream == 0) if(pFileStream == 0)
{ {
return NULL; return NULL;
} }
#endif
size_t szPreambleLength = strlen(cPreamble); size_t szPreambleLength = strlen(cPreamble);

4
src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
View File

@@ -130,8 +130,8 @@ public:
int proxyType0 = colObj0->getCollisionShape()->getShapeType(); int proxyType0 = colObj0->getCollisionShape()->getShapeType();
int proxyType1 = colObj1->getCollisionShape()->getShapeType(); int proxyType1 = colObj1->getCollisionShape()->getShapeType();
bool supportsSpuDispatch = m_dispatcher->supportsDispatchPairOnSpu(proxyType0,proxyType1) bool supportsSpuDispatch = m_dispatcher->supportsDispatchPairOnSpu(proxyType0,proxyType1)
&& (colObj0->getCollisionFlags() != btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) && ((colObj0->getCollisionFlags() & btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) == 0)
&& (colObj1->getCollisionFlags() != btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING); && ((colObj1->getCollisionFlags() & btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) == 0);
if (proxyType0 == COMPOUND_SHAPE_PROXYTYPE) if (proxyType0 == COMPOUND_SHAPE_PROXYTYPE)
{ {