From 56949c8bd69d849a96e2f83fef46ec2c69661b53 Mon Sep 17 00:00:00 2001
From: taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>
Date: Thu, 12 Jun 2008 16:56:43 +0000
Subject: Put glcheck back on GLEW

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@92 84d2e878-0bd5-11dd-ad15-13eda11d74c5
---
 src/Makefile.am | 2 +-
 src/glcheck.c   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 6cd8ff0..bae946c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,7 @@ thrust3d_SOURCES = main.c model.c render.c physics.c game.c texture.c utils.c au
 thrust3d_LDADD = @LIBS@
 
 glcheck_SOURCES = glcheck.c
-glcheck_LDADD = -lGL -lGLU -lglut
+glcheck_LDADD = -lGL -lGLU -lglut -lGLEW
 
 AM_CFLAGS = -Wall -g
 AM_CPPFLAGS = -DDATADIR=\""$(datadir)"/thrust3d\"
diff --git a/src/glcheck.c b/src/glcheck.c
index bfb8901..f41b5d2 100644
--- a/src/glcheck.c
+++ b/src/glcheck.c
@@ -16,9 +16,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
-//#include <glew.h>
-#define GL_GLEXT_PROTOTYPES 1
-#include <gl.h>
+#include <glew.h>
+//#define GL_GLEXT_PROTOTYPES 1
+//#include <gl.h>
 #include <glut.h>
 
 GLuint buffer;
@@ -167,7 +167,7 @@ int main(int argc, char *argv[]) {
 	glutInitWindowSize(512, 512);
 	window = glutCreateWindow("Thrust3D GLcheck");
 	
-	//glewInit();
+	glewInit();
 	glcheck_setup();
 	
 	glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, &var);
-- 
cgit v1.2.3