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

use _WIN32 instead of WIN32 (_WIN32 is a compiler built-in)

Browse Source 
add virtual destructor to bFile
This commit is contained in:
erwin.coumans
2010-02-06 18:50:45 +00:00
parent 744774d9ad
commit a9556d0fd5
21 changed files with 148 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
View File

@@ -39,10 +39,10 @@ subject to the following restrictions:
#ifdef USE_PARALLEL_DISPATCHER #ifdef USE_PARALLEL_DISPATCHER
#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h" #include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
#ifdef WIN32 #ifdef _WIN32
#include "BulletMultiThreaded/Win32ThreadSupport.h" #include "BulletMultiThreaded/Win32ThreadSupport.h"
#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" #include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
#endif //WIN32 #endif //_WIN32
#ifdef USE_LIBSPE2 #ifdef USE_LIBSPE2
#include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h" #include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h"
@@ -323,7 +323,7 @@ void CcdPhysicsDemo::initPhysics()
setShadows(false); setShadows(false);
#ifdef USE_PARALLEL_DISPATCHER #ifdef USE_PARALLEL_DISPATCHER
#ifdef WIN32 #ifdef _WIN32
m_threadSupportSolver = 0; m_threadSupportSolver = 0;
m_threadSupportCollision = 0; m_threadSupportCollision = 0;
#endif // #endif //
@@ -653,7 +653,7 @@ void CcdPhysicsDemo::exitPhysics()
//delete solver //delete solver
delete m_solver; delete m_solver;
#ifdef USE_PARALLEL_DISPATCHER #ifdef USE_PARALLEL_DISPATCHER
#ifdef WIN32 #ifdef _WIN32
if (m_threadSupportSolver) if (m_threadSupportSolver)
{ {
delete m_threadSupportSolver; delete m_threadSupportSolver;
@@ -668,7 +668,7 @@ void CcdPhysicsDemo::exitPhysics()
delete m_dispatcher; delete m_dispatcher;
#ifdef USE_PARALLEL_DISPATCHER #ifdef USE_PARALLEL_DISPATCHER
#ifdef WIN32 #ifdef _WIN32
if (m_threadSupportCollision) if (m_threadSupportCollision)
{ {
delete m_threadSupportCollision; delete m_threadSupportCollision;

2
Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
View File

@@ -29,7 +29,7 @@ static SpuBatchRaycaster* gBatchRaycaster = NULL;
#ifdef USE_LIBSPE2 #ifdef USE_LIBSPE2
#include "BulletMultiThreaded/SpuLibspe2Support.h" #include "BulletMultiThreaded/SpuLibspe2Support.h"
#elif defined (WIN32) #elif defined (_WIN32)
#include "BulletMultiThreaded/Win32ThreadSupport.h" #include "BulletMultiThreaded/Win32ThreadSupport.h"
#else #else
//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added) //other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)

2
Demos/HeightFieldFluidDemo/HfFluidDemo_GL_ShapeDrawer.cpp
View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
Experimental Buoyancy fluid demo written by John McCutchan Experimental Buoyancy fluid demo written by John McCutchan
*/ */
#ifdef WIN32 //needed for glut.h #ifdef _WIN32 //needed for glut.h
#include <windows.h> #include <windows.h>
#endif #endif

2
Demos/MultiThreadedDemo/MultiThreadedDemo.cpp
View File

@@ -26,7 +26,7 @@ subject to the following restrictions:
#ifdef USE_LIBSPE2 #ifdef USE_LIBSPE2
#include "BulletMultiThreaded/SpuLibspe2Support.h" #include "BulletMultiThreaded/SpuLibspe2Support.h"
#elif defined (WIN32) #elif defined (_WIN32)
#include "BulletMultiThreaded/Win32ThreadSupport.h" #include "BulletMultiThreaded/Win32ThreadSupport.h"
#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h" #include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"

2
Demos/OpenGL/GLDebugFont.cpp
View File

@@ -16,7 +16,7 @@ subject to the following restrictions:
#include "GLDebugFont.h" #include "GLDebugFont.h"
#ifdef WIN32//for glut.h #ifdef _WIN32//for glut.h
#include <windows.h> #include <windows.h>
#endif #endif

2
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -13,7 +13,7 @@ subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
*/ */
#ifdef WIN32 //needed for glut.h #ifdef _WIN32 //needed for glut.h
#include <windows.h> #include <windows.h>
#endif #endif
#include "GLDebugFont.h" #include "GLDebugFont.h"

2
Demos/OpenGL/GL_Simplex1to4.cpp
View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
#include "GL_Simplex1to4.h" #include "GL_Simplex1to4.h"
#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h" #include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
#include "GL_ShapeDrawer.h" #include "GL_ShapeDrawer.h"
#ifdef WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif

2
Demos/OpenGL/GlutStuff.h
View File

@@ -15,7 +15,7 @@ subject to the following restrictions:
#ifndef GLUT_STUFF_H #ifndef GLUT_STUFF_H
#define GLUT_STUFF_H #define GLUT_STUFF_H
#ifdef WIN32//for glut.h #ifdef _WIN32//for glut.h
#include <windows.h> #include <windows.h>
#endif #endif

2
Extras/ConvexDecomposition/ConvexDecomposition.h
View File

@@ -37,7 +37,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// //
#ifdef WIN32 #ifdef _WIN32
#include <memory.h> //memcpy #include <memory.h> //memcpy
#endif #endif
#include <string.h> #include <string.h>

2
Extras/ConvexDecomposition/float_math.h
View File

@@ -2,7 +2,7 @@
#define FLOAT_MATH_H #define FLOAT_MATH_H
#ifdef WIN32 #ifdef _WIN32
#pragma warning(disable : 4324) // disable padding warning #pragma warning(disable : 4324) // disable padding warning
#pragma warning(disable : 4244) // disable padding warning #pragma warning(disable : 4244) // disable padding warning
#pragma warning(disable : 4267) // possible loss of data #pragma warning(disable : 4267) // possible loss of data

2
Extras/LibXML/parser.c
View File

@@ -33,7 +33,7 @@
#define IN_LIBXML #define IN_LIBXML
#include "libxml.h" #include "libxml.h"
#if defined(WIN32) && !defined (__CYGWIN__) #if defined(_WIN32) && !defined (__CYGWIN__)
#define XML_DIR_SEP '\\' #define XML_DIR_SEP '\\'
#else #else
#define XML_DIR_SEP '/' #define XML_DIR_SEP '/'

2
Extras/Serialize/BulletFileLoader/bChunk.h
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#define __BCHUNK_H__ #define __BCHUNK_H__
#ifdef WIN32 #ifdef _WIN32
#define long64 __int64 #define long64 __int64
#else #else
#define long64 long long #define long64 long long

2
Extras/Serialize/BulletFileLoader/bFile.h
View File

@@ -102,7 +102,7 @@ namespace bParse {
//todo: make memoryBuffer const char //todo: make memoryBuffer const char
//bFile( const char *memoryBuffer, int len); //bFile( const char *memoryBuffer, int len);
bFile( char *memoryBuffer, int len, const char headerString[7]); bFile( char *memoryBuffer, int len, const char headerString[7]);
~bFile(); virtual ~bFile();
bDNA* getFileDNA() bDNA* getFileDNA()
{ {

4
src/BulletCollision/BroadphaseCollision/btDbvt.h
View File

@@ -32,7 +32,7 @@ subject to the following restrictions:
#define DBVT_IMPL_SSE 1 // SSE #define DBVT_IMPL_SSE 1 // SSE
// Template implementation of ICollide // Template implementation of ICollide
#ifdef WIN32 #ifdef _WIN32
#if (defined (_MSC_VER) && _MSC_VER >= 1400) #if (defined (_MSC_VER) && _MSC_VER >= 1400)
#define DBVT_USE_TEMPLATE 1 #define DBVT_USE_TEMPLATE 1
#else #else
@@ -57,7 +57,7 @@ subject to the following restrictions:
// Specific methods implementation // Specific methods implementation
//SSE gives errors on a MSVC 7.1 //SSE gives errors on a MSVC 7.1
#if defined (BT_USE_SSE) && defined (WIN32) #if defined (BT_USE_SSE) && defined (_WIN32)
#define DBVT_SELECT_IMPL DBVT_IMPL_SSE #define DBVT_SELECT_IMPL DBVT_IMPL_SSE
#define DBVT_MERGE_IMPL DBVT_IMPL_SSE #define DBVT_MERGE_IMPL DBVT_IMPL_SSE
#define DBVT_INT0_IMPL DBVT_IMPL_SSE #define DBVT_INT0_IMPL DBVT_IMPL_SSE

2
src/BulletCollision/Gimpact/gim_memory.h
View File

@@ -117,7 +117,7 @@ void gim_free(void *ptr);
#if defined (WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) #if defined (_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
#define GIM_SIMD_MEMORY 1 #define GIM_SIMD_MEMORY 1
#endif #endif

2
src/BulletMultiThreaded/PlatformDefinitions.h
View File

@@ -3,7 +3,7 @@
///This file provides some platform/compiler checks for common definitions ///This file provides some platform/compiler checks for common definitions
#ifdef WIN32 #ifdef _WIN32
typedef union typedef union
{ {

2
src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuContactResult.h
View File

@@ -17,7 +17,7 @@ subject to the following restrictions:
#define SPU_CONTACT_RESULT2_H #define SPU_CONTACT_RESULT2_H
#ifndef WIN32 #ifndef _WIN32
#include <stdint.h> #include <stdint.h>
#endif #endif

4
src/LinearMath/btScalar.h
View File

@@ -36,7 +36,7 @@ inline int btGetVersion()
#endif #endif
#ifdef WIN32 #ifdef _WIN32
#if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300) #if defined(__MINGW32__) || defined(__CYGWIN__) || (defined (_MSC_VER) && _MSC_VER < 1300)
@@ -61,7 +61,7 @@ inline int btGetVersion()
#define btFsel(a,b,c) __fsel((a),(b),(c)) #define btFsel(a,b,c) __fsel((a),(b),(c))
#else #else
#if (defined (WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION)) #if (defined (_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined (BT_USE_DOUBLE_PRECISION))
#define BT_USE_SSE #define BT_USE_SSE
#include <emmintrin.h> #include <emmintrin.h>
#endif #endif

2
src/LinearMath/btVector3.h
View File

@@ -49,7 +49,7 @@ public:
} }
public: public:
#else //__CELLOS_LV2__ __SPU__ #else //__CELLOS_LV2__ __SPU__
#ifdef BT_USE_SSE // WIN32 #ifdef BT_USE_SSE // _WIN32
union { union {
__m128 mVec128; __m128 mVec128;
btScalar m_floats[4]; btScalar m_floats[4];

2
src/MiniCL/cl_platform.h
View File

@@ -43,7 +43,7 @@ extern "C" {
#define CL_EXTENSION_WEAK_LINK #define CL_EXTENSION_WEAK_LINK
#endif #endif
#ifdef WIN32 #ifdef _WIN32
typedef signed __int8 int8_t; typedef signed __int8 int8_t;
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
typedef signed __int16 int16_t; typedef signed __int16 int16_t;