remove glemu/glexts from cube.hh

src/engine/aa.cc

@@ -6,6 +6,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 extern int intel_texalpha_bug;
 

src/engine/grass.cc

@@ -5,6 +5,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 VARP(grass, 0, 1, 1);
 VAR(dbggrass, 0, 0, 1);

src/engine/main.cc

@@ -20,6 +20,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 static SDL_Window *screen = NULL;

src/engine/material.cc

@@ -9,6 +9,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 vector<materialsurface> editsurfs, glasssurfs[4], watersurfs[4], waterfallsurfs[4], lavasurfs[4], lavafallsurfs[4];
 

src/engine/octaedit.cc

@@ -17,6 +17,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 extern int outline;

src/engine/octarender.cc

@@ -17,6 +17,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 struct vboinfo

src/engine/rendergl.cc

@@ -21,6 +21,7 @@
 #include "water.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 static vec minimapcenter(0, 0, 0), minimapradius(0, 0, 0), minimapscale(0, 0, 0);

src/engine/renderlights.cc

@@ -18,6 +18,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 #define CHANGE_SHADERS 0

src/engine/rendermodel.cc

@@ -13,6 +13,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 VAR(oqdynent, 0, 1, 1);

src/engine/renderparticles.cc

@@ -17,6 +17,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 #if 0

src/engine/rendersky.cc

@@ -9,6 +9,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 static Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
 

src/engine/rendertext.cc

@@ -5,6 +5,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 static hashnameset<font> fonts;
 static font *fontdef = NULL;

src/engine/renderva.cc

@@ -16,6 +16,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)

src/engine/shader.cc

@@ -11,6 +11,7 @@
 #include "texture.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 Shader *Shader::lastshader = NULL;
 

src/engine/stain.cc

@@ -10,6 +10,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 struct stainvert

src/engine/water.cc

@@ -8,6 +8,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 
 extern const vec matnormals[6];
 

src/engine/world.cc

@@ -20,6 +20,7 @@
 #include "world.hh"
 
 #include <shared/cube.hh>
+#include <shared/glemu.hh>
 #include <shared/igame.hh>
 
 VARNR(mapscale, worldscale, 1, 0, 0);

src/shared/cube.hh

@@ -45,10 +45,5 @@
 #include "ents.hh"
 #include "command.hh"
 
-#ifndef STANDALONE
-#include "glexts.hh"
-#include "glemu.hh"
-#endif
-
 #endif
 

src/shared/glemu.cc

@@ -1,4 +1,4 @@
-#include "cube.hh"
+#include "glemu.hh"
 
 #include <engine/rendergl.hh>
 

src/shared/glemu.hh

@@ -2,6 +2,7 @@
 #define SHARED_GLEMU_HH
 
 #include "glexts.hh"
+#include "geom.hh"
 
 namespace gle
 {