Simplified makefile

Made makefile much simpiler, added option to build dynamically with
DEBUG=true

6 files changed, 4 insertions, 83 deletions

diff --git a/src/client/lua_api/scene/icamera.cpp b/src/client/lua_api/scene/icamera.cpp
index dcdec2d..654fc7b 100644
--- a/src/client/lua_api/scene/icamera.cpp
+++ b/src/client/lua_api/scene/icamera.cpp
@@ -14,7 +14,7 @@ extern "C" {
 #include "../gameparts.hpp"
 #include "icamera.hpp"
 #include "igeneric.hpp"
-#include "../../../shared/lua_api/common.h"
+#include <shared/lua_api/common.hpp>
 
 using namespace irr;
 using namespace scene;
diff --git a/src/client/lua_api/scene/icube.cpp b/src/client/lua_api/scene/icube.cpp
deleted file mode 100644
index 8f4c9d8..0000000
--- a/src/client/lua_api/scene/icube.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-
-extern "C" {
-  #include <lua.h>
-  #include <lauxlib.h>
-  #include <lualib.h>
-}
-#include <irrlicht.h>
-
-extern IrrlichtDevice* device;
-
-using namespace irr;
-
-// {} :: scene.newcube(num_size, {v3 pos})
-int newiscenecube(lua_StatE* L){//num_size, {v3 pos}
-	double x,y,z;
-	popvector3d(L,&x, &y, &z);//num_size
-	double size = lua_tonumber(L,-1);//num_size
-	lua_pop(L,1);//
-	IMeshSceneNode* n = device->getSceneManager()->addCubeSceneNode(size,0,-1,core::vector3df(x,y,z));
-
-	lua_newtable(L);//{}
-	lua_pushlightuserdata(L,n);//{},ud_node
-	lua_setfield(L,-2,"node");//{}
-
-	luaL_getmetatable(L,"scene.inode");//{},sene.inode
-	lua_setmetatable(L,-2);
-
-	return 1;
-}
-
-static const luaL_reg iscenenode_m[] = {
-	{"getpos",        iscenegetpos},
-	{"setpos",        iscenesetpos},
-//	{"remove",        removeiguielement},
-	{0, 0},
-};
-
-void icube_register(lua_State* L){
-
-	luaL_newmetatable(L, "scene.icamera");//scene.icamera
-	lua_newtable(L);//scene.icamera, {}
-	luaL_register(L,NULL,icamera_m);//scene.icamera, {}
-	lua_setfield(L,-2,"__index");//scene.icamera
-	lua_pop(L,1);//
-
-	luaL_newmetatable(L, "scene.imayacamera");//scene.imayacamera
-	lua_newtable(L);//scene.imayascamera,{}
-	luaL_register(L,NULL,imayacamera_m);//scene.imayascamera,{}
-	lua_setfield(L,-2,"__index");//scene.imayascamera
-	lua_pop(L,1);//
-
-	luaL_newmetatable(L,"scene.ifpscamera");//scene.ifpscamera
-	lua_newtable(L);//scene.ifpscamera, {}
-	luaL_register(L,NULL,ifpscamera_m);//scene.ifpscamera,{}
-	luaL_register(L,NULL,icamera_m);//scene.ifpscamera,{}
-	lua_setfield(L,-2,"__index");//scene.ifpscamera
-	lua_pop(L,1);//
-
-	lua_getglobal(L,"scene");//{}
-	lua_pushcfunction(L,newiscenecamera);//{},newiscenecamera()
-	lua_setfield(L,-2,"newcamera");//{}
-	lua_pushcfunction(L,newiscenefpscamera);//{},newiscenefpscamera()
-	lua_setfield(L,-2,"newfpscamera");//{}
-	lua_pushcfunction(L,newiscenemayacamera);//{},newiscenemayacamera()
-	lua_setfield(L,-2,"newmayacamera");//{}
-	//printf("\"scene\" was set!\n");	
-	//lua_pop(L,1);
-}
diff --git a/src/client/lua_api/scene/icube.hpp b/src/client/lua_api/scene/icube.hpp
deleted file mode 100644
index ffb4d3b..0000000
--- a/src/client/lua_api/scene/icube.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-extern "C" {
-  #include <lua.h>
-  #include <lauxlib.h>
-  #include <lualib.h>
-}
-#include <irrlicht.h>
-
-void icube_register(lua_State* L);
diff --git a/src/client/lua_api/scene/igeneric.cpp b/src/client/lua_api/scene/igeneric.cpp
index c016788..4619064 100644
--- a/src/client/lua_api/scene/igeneric.cpp
+++ b/src/client/lua_api/scene/igeneric.cpp
@@ -7,7 +7,7 @@ extern "C" {
 #include <irrlicht.h>
 #include "igeneric.hpp"
 #include "../gameparts.hpp"
-#include "../../../shared/lua_api/common.h"
+#include <shared/lua_api/common.hpp>
 
 using namespace irr;
 using namespace core;
diff --git a/src/client/lua_api/scene/ilight.cpp b/src/client/lua_api/scene/ilight.cpp
index 451280a..8f52f2d 100644
--- a/src/client/lua_api/scene/ilight.cpp
+++ b/src/client/lua_api/scene/ilight.cpp
@@ -14,7 +14,7 @@ extern "C" {
 #include "../gameparts.hpp"
 #include "ilight.hpp"
 #include "igeneric.hpp"
-#include "../../../shared/lua_api/common.h"
+#include <shared/lua_api/common.hpp>
 
 using namespace irr;
 using namespace scene;
diff --git a/src/client/lua_api/scene/imesh.cpp b/src/client/lua_api/scene/imesh.cpp
index 2760067..c72e83a 100644
--- a/src/client/lua_api/scene/imesh.cpp
+++ b/src/client/lua_api/scene/imesh.cpp
@@ -14,7 +14,7 @@ extern "C" {
 #include "../gameparts.hpp"
 #include "imesh.hpp"
 #include "igeneric.hpp"
-#include "../../../shared/lua_api/common.h"
+#include <shared/lua_api/common.hpp>
 
 using namespace irr;
 using namespace scene;