diff --git a/CMakeLists.txt b/CMakeLists.txt index 54fe4a0c0..d9a43ae03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1034,7 +1034,7 @@ set(LOVE_SRC_3P_STB src/libraries/stb/stb_image.h ) -add_library(love_3p_stb ${LOVE_SRC_3P_STB}) +# stb_image has no implementation files of its own. # # utf8 @@ -1081,7 +1081,6 @@ set(LOVE_3P love_3p_lodepng love_3p_luasocket love_3p_noise1234 - love_3p_stb love_3p_wuff ) diff --git a/src/libraries/glad/glad.cpp b/src/libraries/glad/glad.cpp index 7237fcf29..d9e41f5a8 100644 --- a/src/libraries/glad/glad.cpp +++ b/src/libraries/glad/glad.cpp @@ -1,8 +1,6 @@ #include #include "glad.hpp" -#define GLAD_USE_SDL - namespace glad { diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp index e9fe8a55d..68e70e299 100644 --- a/src/modules/graphics/opengl/OpenGL.cpp +++ b/src/modules/graphics/opengl/OpenGL.cpp @@ -33,6 +33,9 @@ // C #include +// For SDL_GL_GetProcAddress. +#include + namespace love { namespace graphics @@ -58,7 +61,7 @@ bool OpenGL::initContext() if (contextInitialized) return true; - if (!gladLoadGL()) + if (!gladLoadGLLoader(SDL_GL_GetProcAddress)) return false; initOpenGLFunctions();