From ef74ae83db1d3049e4e890df77d25ac6e1f7719f Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Thu, 15 Oct 2015 09:07:05 -0400
Subject: Added glew and shader loading

---
 include/common.h   | 3 ++-
 include/entities.h | 4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/common.h b/include/common.h
index b2ef8a3..2cf98e4 100644
--- a/include/common.h
+++ b/include/common.h
@@ -8,9 +8,10 @@
 #include <math.h>
 #include <cstdlib>
 #include <SDL2/SDL.h>
+#include <GL/glew.h>
+#include <SDL2/SDL_opengl.h>
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_mixer.h>
-#include <SDL2/SDL_opengl.h>
 
 typedef struct { float x; float y; }vec2;
 
diff --git a/include/entities.h b/include/entities.h
index fc2f35c..5b6bcf1 100644
--- a/include/entities.h
+++ b/include/entities.h
@@ -100,7 +100,3 @@ ENTITY TYPES
 <<<<<<< HEAD
 |->1 Rabbit
 **/
-=======
-|->1 Skirl
-**/
->>>>>>> 58716d5e4f20eb5a30025c88fe5119a0e40c4187
-- 
cgit v1.2.3