this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Moved GLEW headers into GL subdirectory (because upstream apparently insists), but it still has to be modified to find non-system include paths. Removed stray glGetError() in renderer_GL_common.inl.

+6 -5
+3 -1
CMakeLists.txt
··· 119 119 link_libraries (${GLEW_LIBRARIES}) 120 120 else(GLEW_FOUND) 121 121 SET(SDL_gpu_SRCS ${SDL_gpu_SRCS} externals/glew/glew.c) 122 - SET(SDL_gpu_HDRS ${SDL_gpu_HDRS} externals/glew/glew.h externals/glew/glxew.h externals/glew/wglew.h) 122 + SET(SDL_gpu_HDRS ${SDL_gpu_HDRS} externals/glew/GL/glew.h externals/glew/GL/glxew.h externals/glew/GL/wglew.h) 123 + add_definitions("-DGLEW_STATIC") 123 124 endif(GLEW_FOUND) 124 125 endif(NOT SDL_gpu_DISABLE_OPENGL) 125 126 ··· 168 169 169 170 if(NOT GLEW_FOUND) 170 171 include_directories(src/externals/glew) 172 + include_directories(src/externals/glew/GL) 171 173 endif(NOT GLEW_FOUND) 172 174 173 175 if(NOT STBI_FOUND)
+3 -3
src/externals/glew/glew.c
··· 30 30 ** THE POSSIBILITY OF SUCH DAMAGE. 31 31 */ 32 32 33 - #include "glew.h" 33 + #include "GL/glew.h" 34 34 35 35 #if defined(_WIN32) 36 - # include <GL/wglew.h> 36 + # include "GL/wglew.h" 37 37 #elif !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && (!defined(__APPLE__) || defined(GLEW_APPLE_GLX)) 38 - # include <GL/glxew.h> 38 + # include "GL/glxew.h" 39 39 #endif 40 40 41 41 #include <stddef.h> /* For size_t */
src/externals/glew/glew.h src/externals/glew/GL/glew.h
src/externals/glew/glxew.h src/externals/glew/GL/glxew.h
src/externals/glew/wglew.h src/externals/glew/GL/wglew.h
-1
src/renderer_GL_common.inl
··· 1107 1107 cdata->last_camera = target->camera; // Redundant due to applyTargetCamera(), below 1108 1108 cdata->last_camera_inverted = 0; 1109 1109 1110 - err = glGetError(); 1111 1110 #ifdef SDL_GPU_USE_OPENGL 1112 1111 glewExperimental = GL_TRUE; // Force GLEW to get exported functions instead of checking via extension string 1113 1112 err = glewInit();