Merge branch 'master' of https://github.com/erwincoumans/bullet3

examples/OpenGLWindow/X11OpenGLWindow.cpp

@@ -6,11 +6,7 @@
 
 #include<stdio.h>
 #include<stdlib.h>
-#ifdef GLEW_STATIC
 #include "glad/gl.h"
-#else
-#include <GL/glew.h>
-#endif//GLEW_STATIC
 
 #ifdef GLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS
 #include "glad/glx.h"

examples/SharedMemory/grpc/main.cpp

@@ -28,7 +28,7 @@ typedef SharedMemoryCommandProcessor MyCommandProcessor;
 #include <grpc++/grpc++.h>
 #include <grpc/support/log.h>
 
-#include "proto/pybullet.grpc.pb.h"
+#include "SharedMemory/grpc/proto/pybullet.grpc.pb.h"
 
 
 using grpc::Server;