fix conflicting declaration OpenGL and just include glew (#6187)

#changelog #core
openframeworks · Dec 21, 2018 · fb0ec3c · fb0ec3c
1 parent 8ad1fbb
commit fb0ec3c
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h
@@ -124,7 +124,7 @@ enum ofTargetPlatform{
 	#define GLEW_STATIC
 	#define GLEW_NO_GLU
 	#include "GL/glew.h"
-    #include "GL/wglew.h"
+	#include "GL/wglew.h"
 	#define __WINDOWS_DS__
 	#define __WINDOWS_MM__
 	#if (_MSC_VER)       // microsoft visual studio
@@ -177,7 +177,6 @@ enum ofTargetPlatform{
 	#endif
 	#include <unistd.h>
 	#include "GL/glew.h"
-	#include <OpenGL/gl.h>
 	#include <ApplicationServices/ApplicationServices.h>
 
 	#if defined(__LITTLE_ENDIAN__)
@@ -205,11 +204,8 @@ enum ofTargetPlatform{
 		#define EGL_EGLEXT_PROTOTYPES
 		#include "EGL/egl.h"
 		#include "EGL/eglext.h"
-	#else // normal linux
-		#define GL_GLEXT_PROTOTYPES
-		#include <GL/glew.h>
-		#include <GL/gl.h>
-		#include <GL/glext.h>
+	#else // desktop linux
+		#include <GL/glew.h> 
 	#endif
 
 	// for some reason, this isn't defined at compile time,