Merge branch 'GLExtensions'

CMakeLists.txt

@@ -293,6 +293,8 @@ if(ANDROID)
 	set(USE_GLES3 1)
 endif()
 
+include_directories(Externals/GL)
+
 # For now GLES and EGL are tied to each other.
 # Enabling GLES also disables the OpenGL plugin.
 if(USE_GLES3)
@@ -352,8 +354,6 @@ if(NOT ANDROID)
 
 	if(NOT USE_GLES3)
 		include(FindOpenGL)
-		include_directories(${OPENGL_INCLUDE_DIR})
-		add_definitions(-DGLEW_NO_GLU)
 	else()
 		set(X11_FOUND 1)
 	endif()
@@ -653,22 +653,6 @@ else()
 	include_directories(Externals/SOIL)
 endif()
 
-if(WIN32)
-	find_library(GLEW glew32s PATHS Externals/GLew)
-	include_directories(Externals/GLew/include)
-else()
-	if(NOT USE_GLES3)
-		if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-			include(FindGLEW)
-		endif()
-		if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_10_METHODS)
-			message("Using static GLEW from Externals")
-			add_subdirectory(Externals/GLew)
-			include_directories(Externals/GLew/include)
-		endif()
-	endif()
-endif()
-
 if (ANDROID)
 	message("Using static iconv from Externals")
 	include_directories(Externals/libiconv-1.14/include)