fix mac build

2014-08-20 17:24:12 -07:00
parent cb55f7df30
commit ed637a6942
3 changed files with 6 additions and 3 deletions
--- a/Demos/OpenGL/GLDebugFont.cpp
+++ b/Demos/OpenGL/GLDebugFont.cpp
@@ -14,9 +14,8 @@ subject to the following restrictions:
 */

 #include "GLDebugFont.h"
-#include "OpenGLWindow/OpenGLInclude.h"
-
 #ifdef DONT_USE_GLUT
+#include "OpenGLWindow/OpenGLInclude.h"
 #else
 #ifdef _WIN32//for glut.h
 #include <windows.h>
--- a/Demos3/BasicDemoCustomOpenGL2/premake4.lua
+++ b/Demos3/BasicDemoCustomOpenGL2/premake4.lua
@@ -8,7 +8,7 @@ project "App_BasicDemoCustomOpenGL2"
 	  	"../../btgui"
 	  }
 		
-		defines { "DONT_USE_GLUT"}
+		defines { "DONT_USE_GLUT", "USE_OPENGL2"}
 		
 		initOpenGL()
 		initGlew()
--- a/btgui/OpenGLWindow/OpenGLInclude.h
+++ b/btgui/OpenGLWindow/OpenGLInclude.h
@@ -24,7 +24,11 @@ subject to the following restrictions:
 //#include <OpenGL/gl.h>
 //#include <OpenGL/glu.h>
 //#import <Cocoa/Cocoa.h>
+#ifdef USE_OPENGL2
+#include <OpenGL/gl.h>
+#else
 #include <OpenGL/gl3.h>
+#endif
 #else

 #include "GlewWindows/GL/glew.h"