X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=util.cpp;h=8dcf219b3ee6be7cd8592f26268eefb33bae3fcb;hp=f1b838a2cecc12504bb4c4217a083136de750c60;hb=24660d2111d0ee97228016a7072304ff657d297b;hpb=96a1cff51a8b7dc45ebe725e0d0685eecce31331

diff --git a/util.cpp b/util.cpp
index f1b838a..8dcf219 100644
--- a/util.cpp
+++ b/util.cpp
@@ -1,13 +1,9 @@
-#define GL_GLEXT_PROTOTYPES 1
-
 #include <stdio.h>
 #include <assert.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include <math.h>
 #include "util.h"
+#include "opengl.h"
 
 void hsv2rgb(float h, float s, float v, float *r, float *g, float *b)
 {
@@ -69,7 +65,7 @@ GLuint compile_shader(const std::string &shader_src, GLenum type)
 {
 	GLuint obj = glCreateShader(type);
 	const GLchar* source[] = { shader_src.data() };
-	const GLint length[] = { shader_src.size() };
+	const GLint length[] = { (GLint)shader_src.size() };
 	glShaderSource(obj, 1, source, length);
 	glCompileShader(obj);