diff --git a/Demos/OpenGL/GLDebugFont.cpp b/Demos/OpenGL/GLDebugFont.cpp index e36c8c037..a54e957a9 100644 --- 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 diff --git a/Demos3/BasicDemoCustomOpenGL2/premake4.lua b/Demos3/BasicDemoCustomOpenGL2/premake4.lua index c9dada132..c37918dc5 100644 --- 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() diff --git a/btgui/OpenGLWindow/OpenGLInclude.h b/btgui/OpenGLWindow/OpenGLInclude.h index 19d4f3725..6b4f3df11 100644 --- a/btgui/OpenGLWindow/OpenGLInclude.h +++ b/btgui/OpenGLWindow/OpenGLInclude.h @@ -24,7 +24,11 @@ subject to the following restrictions: //#include //#include //#import +#ifdef USE_OPENGL2 +#include +#else #include +#endif #else #include "GlewWindows/GL/glew.h"