diff --git a/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp b/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp index c8cf2af76..d005177cb 100644 --- a/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp +++ b/Demos3/GpuDemos/rigidbody/GpuConvexScene.cpp @@ -19,7 +19,7 @@ #include "../gwenUserInterface.h" #include "Bullet3Dynamics/ConstraintSolver/b3Point2PointConstraint.h" #include "OpenGLWindow/GLPrimitiveRenderer.h" -#include "Bullet3OpenCL/RayCast/b3GpuRayCast.h" +#include "Bullet3OpenCL/Raycast/b3GpuRaycast.h" void GpuConvexScene::setupScene(const ConstructionInfo& ci) diff --git a/btgui/OpenGLWindow/OpenGLInclude.h b/btgui/OpenGLWindow/OpenGLInclude.h index 5a28716ca..a43f00be8 100644 --- a/btgui/OpenGLWindow/OpenGLInclude.h +++ b/btgui/OpenGLWindow/OpenGLInclude.h @@ -42,10 +42,10 @@ subject to the following restrictions: ///on Linux only glDrawElementsInstancedARB is defined?!? -#ifdef __linux -#define glDrawElementsInstanced glDrawElementsInstancedARB - -#endif //__linux +//#ifdef __linux +//#define glDrawElementsInstanced glDrawElementsInstancedARB +// +//#endif //__linux #endif //__OPENGL_INCLUDE_H diff --git a/test/OpenCL/BasicInitialize/main.cpp b/test/OpenCL/BasicInitialize/main.cpp index c9d8ac990..c85234125 100644 --- a/test/OpenCL/BasicInitialize/main.cpp +++ b/test/OpenCL/BasicInitialize/main.cpp @@ -24,15 +24,11 @@ cl_command_queue g_cqCommandQue; #include "Bullet3Common/b3Logging.h" -#include void myprintf(const char* msg) { -#ifdef _WINDOWS - OutputDebugStringA(msg); -#else + //OutputDebugStringA(msg); printf(msg); -#endif } int main(int argc, char* argv[]) @@ -117,4 +113,4 @@ int main(int argc, char* argv[]) b3Printf("press \n"); getchar(); return 0; -} \ No newline at end of file +}