Browse Source

Hopefully fixed the Windows build (see issue #921.)

--HG--
branch : minor
Alex Szpakowski 11 years ago
parent
commit
b59e088d6c
3 changed files with 5 additions and 5 deletions
  1. 1 2
      CMakeLists.txt
  2. 0 2
      src/libraries/glad/glad.cpp
  3. 4 1
      src/modules/graphics/opengl/OpenGL.cpp

+ 1 - 2
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
 )
 

+ 0 - 2
src/libraries/glad/glad.cpp

@@ -1,8 +1,6 @@
 #include <string.h>
 #include "glad.hpp"
 
-#define GLAD_USE_SDL
-
 namespace glad {
 
 

+ 4 - 1
src/modules/graphics/opengl/OpenGL.cpp

@@ -33,6 +33,9 @@
 // C
 #include <cstring>
 
+// For SDL_GL_GetProcAddress.
+#include <SDL_video.h>
+
 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();