use _WIN32 instead of WIN32 (_WIN32 is a compiler built-in)
add virtual destructor to bFile
This commit is contained in:
@@ -39,10 +39,10 @@ subject to the following restrictions:
|
||||
|
||||
#ifdef USE_PARALLEL_DISPATCHER
|
||||
#include "BulletMultiThreaded/SpuGatheringCollisionDispatcher.h"
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#include "BulletMultiThreaded/Win32ThreadSupport.h"
|
||||
#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
|
||||
#endif //WIN32
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef USE_LIBSPE2
|
||||
#include "../../Extras/BulletMultiThreaded/SpuLibspe2Support.h"
|
||||
@@ -323,7 +323,7 @@ void CcdPhysicsDemo::initPhysics()
|
||||
setShadows(false);
|
||||
|
||||
#ifdef USE_PARALLEL_DISPATCHER
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
m_threadSupportSolver = 0;
|
||||
m_threadSupportCollision = 0;
|
||||
#endif //
|
||||
@@ -653,7 +653,7 @@ void CcdPhysicsDemo::exitPhysics()
|
||||
//delete solver
|
||||
delete m_solver;
|
||||
#ifdef USE_PARALLEL_DISPATCHER
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
if (m_threadSupportSolver)
|
||||
{
|
||||
delete m_threadSupportSolver;
|
||||
@@ -668,7 +668,7 @@ void CcdPhysicsDemo::exitPhysics()
|
||||
delete m_dispatcher;
|
||||
|
||||
#ifdef USE_PARALLEL_DISPATCHER
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
if (m_threadSupportCollision)
|
||||
{
|
||||
delete m_threadSupportCollision;
|
||||
|
||||
@@ -29,7 +29,7 @@ static SpuBatchRaycaster* gBatchRaycaster = NULL;
|
||||
|
||||
#ifdef USE_LIBSPE2
|
||||
#include "BulletMultiThreaded/SpuLibspe2Support.h"
|
||||
#elif defined (WIN32)
|
||||
#elif defined (_WIN32)
|
||||
#include "BulletMultiThreaded/Win32ThreadSupport.h"
|
||||
#else
|
||||
//other platforms run the parallel code sequentially (until pthread support or other parallel implementation is added)
|
||||
|
||||
@@ -15,7 +15,7 @@ subject to the following restrictions:
|
||||
Experimental Buoyancy fluid demo written by John McCutchan
|
||||
*/
|
||||
|
||||
#ifdef WIN32 //needed for glut.h
|
||||
#ifdef _WIN32 //needed for glut.h
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ subject to the following restrictions:
|
||||
|
||||
#ifdef USE_LIBSPE2
|
||||
#include "BulletMultiThreaded/SpuLibspe2Support.h"
|
||||
#elif defined (WIN32)
|
||||
#elif defined (_WIN32)
|
||||
#include "BulletMultiThreaded/Win32ThreadSupport.h"
|
||||
#include "BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.h"
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ subject to the following restrictions:
|
||||
#include "GLDebugFont.h"
|
||||
|
||||
|
||||
#ifdef WIN32//for glut.h
|
||||
#ifdef _WIN32//for glut.h
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ subject to the following restrictions:
|
||||
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>
|
||||
#endif
|
||||
#include "GLDebugFont.h"
|
||||
|
||||
@@ -15,7 +15,7 @@ subject to the following restrictions:
|
||||
#include "GL_Simplex1to4.h"
|
||||
#include "BulletCollision/NarrowPhaseCollision/btSimplexSolverInterface.h"
|
||||
#include "GL_ShapeDrawer.h"
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ subject to the following restrictions:
|
||||
#ifndef GLUT_STUFF_H
|
||||
#define GLUT_STUFF_H
|
||||
|
||||
#ifdef WIN32//for glut.h
|
||||
#ifdef _WIN32//for glut.h
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user