From f26d4fdc4c888b4af9c28f5e25a44e000233ad71 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Mon, 10 Sep 2018 08:55:47 -0700 Subject: [PATCH] pybullet eglPlugin: fix Mac OSX build --- .../eglPlugin/eglRendererVisualShapeConverter.cpp | 10 +++++++--- .../TinyRendererVisualShapeConverter.cpp | 1 - 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp index 6dbba994e..f97da5134 100644 --- a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp @@ -33,7 +33,10 @@ subject to the following restrictions: #include "../TinyRenderer/model.h" #include "stb_image/stb_image.h" - +#ifdef __APPLE__ +#include "OpenGLWindow/MacOpenGLWindow.h" +typedef MacOpenGLWindow DefaultOpenGLWindow; +#else #ifdef _WIN32 #include "OpenGLWindow/Win32OpenGLWindow.h" typedef Win32OpenGLWindow DefaultOpenGLWindow; @@ -44,8 +47,9 @@ typedef EGLOpenGLWindow DefaultOpenGLWindow; #else #include "OpenGLWindow/X11OpenGLWindow.h" typedef X11OpenGLWindow DefaultOpenGLWindow; -#endif -#endif +#endif//BT_USE_EGL +#endif// _WIN32 +#endif //__APPLE__ #include "OpenGLWindow/GLInstancingRenderer.h" #include "OpenGLWindow/GLRenderToTexture.h" diff --git a/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp index 708565e58..d68c3fe17 100644 --- a/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp @@ -122,7 +122,6 @@ struct TinyRendererVisualShapeConverterInternalData virtual ~TinyRendererVisualShapeConverterInternalData() { - printf("~TinyRendererVisualShapeConverterInternalData()\n"); } };