diff options
| author | erwincoumans <erwin.coumans@gmail.com> | 2015-05-07 15:55:39 -0700 |
|---|---|---|
| committer | erwincoumans <erwin.coumans@gmail.com> | 2015-05-07 15:55:39 -0700 |
| commit | 30ebb322285809bde98959e10e73e5acb9981efc (patch) | |
| tree | e624fe9f98c3024d3f5c598de3c845884e505120 | |
| parent | c4f6303a0aba3781826506a591b9d00fdcf8fb84 (diff) | |
| parent | 0e91358e661ca413416d72b3a63df75bd01425c5 (diff) | |
| download | bullet3-2.83.4.tar.gz | |
Merge pull request #381 from erwincoumans/master2.83.4
test again, for mac travis support
| -rw-r--r-- | examples/OpenGLWindow/SimpleOpenGL3App.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/OpenGLWindow/SimpleOpenGL3App.cpp b/examples/OpenGLWindow/SimpleOpenGL3App.cpp index 905383388..81466bec4 100644 --- a/examples/OpenGLWindow/SimpleOpenGL3App.cpp +++ b/examples/OpenGLWindow/SimpleOpenGL3App.cpp @@ -1,3 +1,5 @@ +#ifndef NO_OPENGL3 + #include "SimpleOpenGL3App.h" #include "ShapeData.h" #ifdef __APPLE__ @@ -774,5 +776,5 @@ int SimpleOpenGL3App::getUpAxis() const { return m_data->m_upAxis; } - +#endif//#ifndef NO_OPENGL3 |