Big include and libraries clean up.

9 files changed, 6 insertions, 29 deletions

diff --git a/src/extantz/Evas_3D_demo.c b/src/extantz/Evas_3D_demo.c
index 6cb673b..371bba7 100644
--- a/src/extantz/Evas_3D_demo.c
+++ b/src/extantz/Evas_3D_demo.c
@@ -1,5 +1,4 @@
 #include "extantz.h"
-#include "scenri.h"
 
 
 static const float cube_vertices[] =
diff --git a/src/extantz/build.lua b/src/extantz/build.lua
index 618de3f..90caca5 100755
--- a/src/extantz/build.lua
+++ b/src/extantz/build.lua
@@ -13,9 +13,9 @@ if 'nil' == type(dir) then
   dir = workingDir
 end
 
-CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua -I../love'
+CFLAGS  = CFLAGS  .. ' -I../../libraries/irrlicht-1.8.1/include -I/usr/X11R6/include -I../GuiLua'
 LDFLAGS = LDFLAGS .. ' -L../../libraries/irrlicht-1.8.1/lib/Linux'
-libs    = libs    .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua -lwinFang -lRunnr'
+libs    = libs    .. ' -lIrrlicht -lephysics -lGL -lbz2 -lGuiLua'
 
 removeFiles(dir, {'crappisspuke.o', 'CDemo.o', 'extantzCamera.o', 'gears.o', 'ephysics_demo.o', 'Evas_3D_demo.o', '../../media/extantz.edj'})
 removeFiles(dir, {'../../extantz', 'camera.o', 'files.o', 'scenri.o', 'woMan.o'})
diff --git a/src/extantz/camera.c b/src/extantz/camera.c
index b7a79d1..c94b780 100644
--- a/src/extantz/camera.c
+++ b/src/extantz/camera.c
@@ -1,6 +1,5 @@
 #include "extantz.h"
 
-#include "evas_3d_utils.h"
 
 static inline void evas_euler_to_quaternion(Evas_Vec4 *out, Evas_Vec3 *in)
 {
diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c
index 89dda99..a86cad2 100644
--- a/src/extantz/ephysics_demo.c
+++ b/src/extantz/ephysics_demo.c
@@ -1,5 +1,4 @@
 #include "extantz.h"
-#include <EPhysics.h>
 
 
 #define EPHYSICS_TEST_THEME "extantz"
diff --git a/src/extantz/extantzCamera.cpp b/src/extantz/extantzCamera.cpp
index 4d13054..a3145ae 100644
--- a/src/extantz/extantzCamera.cpp
+++ b/src/extantz/extantzCamera.cpp
@@ -12,6 +12,9 @@
 // Initally I'll make it SecondLife like, coz that's what my muscle memory is used to.
 // It will get extended and made generic though.
 
+#include <irrlicht.h>
+#include "extantz.h"
+
 #include "extantzCamera.h"
 #include "IVideoDriver.h"
 #include "ISceneManager.h"
diff --git a/src/extantz/extantzCamera.h b/src/extantz/extantzCamera.h
index 6e9067f..5c98619 100644
--- a/src/extantz/extantzCamera.h
+++ b/src/extantz/extantzCamera.h
@@ -5,7 +5,6 @@
 #ifndef __EXTANTZ_CAMERA_H_INCLUDED__
 #define __EXTANTZ_CAMERA_H_INCLUDED__
 
-
 #ifdef __cplusplus
 #include <ISceneNodeAnimator.h>
 #include <vector2d.h>
@@ -13,7 +12,6 @@
 #include <SKeyMap.h>
 #include <irrArray.h>
 #include <ICameraSceneNode.h>
-#include "scenri.h"
 
 using namespace irr;
 using namespace scene;
diff --git a/src/extantz/scenri.c b/src/extantz/scenri.c
index 0210a48..7395582 100644
--- a/src/extantz/scenri.c
+++ b/src/extantz/scenri.c
@@ -1,5 +1,4 @@
 #include "extantz.h"
-#include "scenri.h"
 
 static void _on_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *einfo)
 {
diff --git a/src/extantz/scenri.h b/src/extantz/scenri.h
index 93b3f16..310b615 100644
--- a/src/extantz/scenri.h
+++ b/src/extantz/scenri.h
@@ -3,6 +3,7 @@
 
 #include "love.h"
 
+
 typedef struct _cameraMove
 {
     float       x, y, z;
@@ -11,27 +12,6 @@ typedef struct _cameraMove
     float       JumpSpeed, RotateSpeed, MoveSpeed;
 } cameraMove;
 
-typedef struct _vec4
-{
-    float   x;
-    float   y;
-    float   z;
-    float   w;
-} vec4;
-
-typedef struct _vec3
-{
-    float   x;
-    float   y;
-    float   z;
-} vec3;
-
-typedef struct _vec2
-{
-    float   x;
-    float   y;
-} vec2;
-
 typedef struct _vertex
 {
     vec3    position;
diff --git a/src/extantz/evas_3d_utils.h b/src/libraries/evas_3d_utils.h
index 8adc322..8adc322 100644
--- a/src/extantz/evas_3d_utils.h
+++ b/src/libraries/evas_3d_utils.h