use GLAD to link OpenGL

BUILDING-cmake.md

@@ -11,7 +11,6 @@ Required tools and dependencies:
 - CMake 3.21 or higher.
 - A working toolchain, e.g. Visual Studio on Windows or the `build-essentials` package on Ubuntu Linux.
 - Main OpenGL libraries and development files.
-- The `GLEW` Library on Windows.
 
 To use the library in other projects, it is required to install it. Use `CMAKE_INSTALL_PREFIX` to specify the
 installation directory.

BUILDING.md

@@ -100,11 +100,6 @@ development files. To build projectM, both binaries and development files need t
   library dependencies and/or using CMake to configure the build. Mainly used on Windows, but also works for Linux and
   macOS.
 
-### Only relevant for Windows:
-
-* [**GLEW**](http://glew.sourceforge.net/): The OpenGL Extension Wrangler Library. Only required if using CMake to
-  configure the build, the pre-created solutions use a bundled copy of GLEW.
-
 ## Building on Linux and macOS
 
 ### Installing dependencies

CMakeLists.txt

@@ -165,36 +165,12 @@ else()
 
     if(ENABLE_GLES)
         message(STATUS "Building for OpenGL Embedded Profile")
-        if(NOT CMAKE_SYSTEM_NAME STREQUAL Linux
-                AND NOT CMAKE_SYSTEM_NAME STREQUAL Android)
-            message(FATAL_ERROR "OpenGL ES 3 support is currently only available for Linux platforms. You're building for ${CMAKE_SYSTEM_NAME}.")
-        endif()
-
-        # We use a local find script for OpenGL::GLES3 until the proposed changes are merged upstream.
-        list(APPEND CMAKE_MODULE_PATH "${PROJECTM_SOURCE_DIR}/cmake/gles")
-        find_package(OpenGL REQUIRED COMPONENTS GLES3)
-        if(NOT TARGET OpenGL::GLES3)
-            message(FATAL_ERROR "No suitable GLES3 library was found.")
-        endif()
-
-        set(PROJECTM_OPENGL_LIBRARIES OpenGL::GLES3)
         set(USE_GLES ON)
     else()
         message(STATUS "Building for OpenGL Core Profile")
-        find_package(OpenGL REQUIRED)
-        set(PROJECTM_OPENGL_LIBRARIES OpenGL::GL)
-        # GLX is required by SOIL2 on platforms with the X Window System (e.g. most Linux distributions)
-        if(TARGET OpenGL::GLX)
-            list(APPEND PROJECTM_OPENGL_LIBRARIES OpenGL::GLX)
-        endif()
-        if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-            find_package(GLEW REQUIRED)
-            # Prefer shared, but check for static lib if shared is not available.
-            if(TARGET GLEW::glew)
-                list(APPEND PROJECTM_OPENGL_LIBRARIES GLEW::glew)
-            elseif(TARGET GLEW::glew_s)
-                list(APPEND PROJECTM_OPENGL_LIBRARIES GLEW::glew_s)
-            endif()
+        if(WIN32)
+            find_package(OpenGL REQUIRED)
+            set(PROJECTM_OPENGL_LIBRARIES OpenGL::GL)
         endif()
     endif()
 endif()

cmake/SDL2Target.cmake

@@ -55,7 +55,7 @@ endif()
 
 # Temporary fix to deal with wrong include dir set by SDL2's CMake configuration.
 get_target_property(_SDL2_INCLUDE_DIR SDL2::SDL2 INTERFACE_INCLUDE_DIRECTORIES)
-if(_SDL2_INCLUDE_DIR MATCHES "(.+)/SDL2\$" AND _SDL2_TARGET_TYPE STREQUAL STATIC_LIBRARY)
+if(_SDL2_INCLUDE_DIR MATCHES "(.+)/SDL2\$")
     # Check if SDL2::SDL2 is aliased to SDL2::SDL2-static (will be the case for static-only builds)
     get_target_property(_SDL2_ALIASED_TARGET SDL2::SDL2 ALIASED_TARGET)
     if(_SDL2_ALIASED_TARGET)