aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-05 20:43:02 +1000
committerDavid Walter Seikel2014-05-05 20:43:02 +1000
commit205c2b6eaa23c04691f92ad0d60407f98eed766b (patch)
tree134e24db39b85490de520493ba69812c113d424b /src/extantz
parentCall skang modules from extantz. Needs some clean up. (diff)
downloadSledjHamr-205c2b6eaa23c04691f92ad0d60407f98eed766b.zip
SledjHamr-205c2b6eaa23c04691f92ad0d60407f98eed766b.tar.gz
SledjHamr-205c2b6eaa23c04691f92ad0d60407f98eed766b.tar.bz2
SledjHamr-205c2b6eaa23c04691f92ad0d60407f98eed766b.tar.xz
Clean up include files.
Diffstat (limited to 'src/extantz')
-rw-r--r--src/extantz/CDemo.cpp1
-rw-r--r--src/extantz/camera.c1
-rw-r--r--src/extantz/ephysics_demo.c1
-rw-r--r--src/extantz/extantz.c2
-rw-r--r--src/extantz/extantz.h15
5 files changed, 13 insertions, 7 deletions
diff --git a/src/extantz/CDemo.cpp b/src/extantz/CDemo.cpp
index 7151b5f..f9363c5 100644
--- a/src/extantz/CDemo.cpp
+++ b/src/extantz/CDemo.cpp
@@ -3,7 +3,6 @@
3 3
4#include <irrlicht.h> 4#include <irrlicht.h>
5#include "extantz.h" 5#include "extantz.h"
6#include "extantzCamera.h"
7#include "CDemo.h" 6#include "CDemo.h"
8 7
9CDemo::CDemo(GLData *gld, bool a) 8CDemo::CDemo(GLData *gld, bool a)
diff --git a/src/extantz/camera.c b/src/extantz/camera.c
index e566fbb..d221ea0 100644
--- a/src/extantz/camera.c
+++ b/src/extantz/camera.c
@@ -1,5 +1,6 @@
1#include "extantz.h" 1#include "extantz.h"
2 2
3
3static void _on_camera_input_down(void *data, Evas *evas, Evas_Object *obj, void *event_info) 4static void _on_camera_input_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
4{ 5{
5 globals *ourGlobals = data; 6 globals *ourGlobals = data;
diff --git a/src/extantz/ephysics_demo.c b/src/extantz/ephysics_demo.c
index f5036b9..6697cc9 100644
--- a/src/extantz/ephysics_demo.c
+++ b/src/extantz/ephysics_demo.c
@@ -1,4 +1,5 @@
1#include "extantz.h" 1#include "extantz.h"
2#include <EPhysics.h>
2 3
3 4
4#if USE_PHYSICS 5#if USE_PHYSICS
diff --git a/src/extantz/extantz.c b/src/extantz/extantz.c
index 7346aea..d0cd8ef 100644
--- a/src/extantz/extantz.c
+++ b/src/extantz/extantz.c
@@ -1,4 +1,6 @@
1#include "extantz.h" 1#include "extantz.h"
2#include "SledjHamr.h"
3#include "LumbrJack.h"
2 4
3 5
4static int logDom; // Our logging domain. 6static int logDom; // Our logging domain.
diff --git a/src/extantz/extantz.h b/src/extantz/extantz.h
index 969ac98..4ecf8e8 100644
--- a/src/extantz/extantz.h
+++ b/src/extantz/extantz.h
@@ -1,19 +1,20 @@
1#ifndef _EXTANTZ_H_
2#define _EXTANTZ_H_
3
1#define USE_PHYSICS 1 4#define USE_PHYSICS 1
2#define USE_IRR 0 5#define USE_IRR 0
3#define USE_DEMO 0 6#define USE_DEMO 0
4#define DO_GEARS 0 7#define DO_GEARS 0
5 8
6 9
7#include "SledjHamr.h" 10#include "winFang.h"
8#include "LumbrJack.h" 11#include "GuiLua.h"
12
9#include <elm_widget_glview.h> 13#include <elm_widget_glview.h>
10#include <Evas_GL.h> 14#include <Evas_GL.h>
11#include <EPhysics.h> 15#include <EPhysics.h>
12#include "extantzCamera.h"
13#include "winFang.h"
14#include "Runnr.h"
15#include "GuiLua.h"
16 16
17#include "extantzCamera.h"
17 18
18#ifdef GL_GLES 19#ifdef GL_GLES
19#include <EGL/egl.h> 20#include <EGL/egl.h>
@@ -264,3 +265,5 @@ winFang *woMan_add(globals *ourGlobals);
264#ifdef __cplusplus 265#ifdef __cplusplus
265} 266}
266#endif 267#endif
268
269#endif