diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 4: Remove dependency on GLEW.

Message ID 20110721123630.17019.9324.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Alexandros Frantzis July 21, 2011, 12:36 p.m. UTC 
------------------------------------------------------------
revno: 4
committer: Alexandros Frantzis <alf82@freemail.gr>
timestamp: Wed 2010-07-07 15:33:49 +0300
message:
  Remove dependency on GLEW.
modified:
  makefile
  oglsdl.h
  screen.cpp


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'makefile'
--- makefile	2010-07-07 10:32:18 +0000
+++ makefile	2010-07-07 12:33:49 +0000
@@ -1,2 +1,2 @@ 
 all:
-	g++ *.cpp -o glmark -Wall -lSDL -lGL -lGLU -lGLEW
+	g++ *.cpp -o glmark -Wall -lSDL -lGL -lGLU

=== modified file 'oglsdl.h'
--- oglsdl.h	2010-07-07 10:32:18 +0000
+++ oglsdl.h	2010-07-07 12:33:49 +0000
@@ -2,6 +2,11 @@ 
 #define _OGLSDL_H
 
 #include <SDL/SDL.h>
-#include <GL/glew.h>
+
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <GL/glu.h>
+
 
 #endif

=== modified file 'screen.cpp'
--- screen.cpp	2010-07-07 10:32:18 +0000
+++ screen.cpp	2010-07-07 12:33:49 +0000
@@ -56,19 +56,6 @@ 
     
     SDL_WM_SetCaption("GLMark 08", NULL);
     
-    GLenum err = glewInit();
-    if(GLEW_OK != err)
-    {
-        fprintf(stderr, "[ Fail ] - Error: %s\n", glewGetErrorString(err));
-        return 0;
-    }
-
-    if(!GLEW_ARB_vertex_buffer_object)
-    {
-        fprintf(stderr, "[ Fail ] - VBO objects are not supported\n");
-        return 0;
-    }
-
     glShadeModel(GL_SMOOTH);
     glClearColor(0.0f, 0.0f, 0.0f, 0.5f);
     glClearDepth(1.0f);