Merge pull request #381 from erwincoumans/master

test again, for mac travis support
2015-05-07 15:55:39 -07:00
parent c4f6303a0a 0e91358e66
commit 30ebb32228
1 changed files with 3 additions and 1 deletions
--- 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