AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-13 13:20:07 +00:00
Code Issues Releases Wiki Activity

fix Mac OSX build, due to conflict empty #define __global and STL

Browse Source
This commit is contained in:
Erwin Coumans 2014-01-26 12:08:04 -08:00
parent 7cdda65822
commit e3ee9e5b2e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Demos3/GpuDemos/broadphase/PairBench.cpp
View File

@ -1,3 +1,7 @@
//those header files need to be at the top, because of conflict __global and STL
#include "../gwenUserInterface.h"
#include "../gwenInternalData.h"
#include "PairBench.h"
#include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h"
@ -12,8 +16,6 @@
#include "OpenGLWindow/GLInstanceRendererInternalData.h"
#include "Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.h"
#include "../../../btgui/Timing/b3Quickprof.h"
#include "../gwenUserInterface.h"
#include "../GwenInternalData.h"
#include <string.h>