From 4608beb3c6abca76252aa4b39bfd2e5d7fa87609 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 8 Dec 2013 18:24:56 +0100
Subject: Fixed tolua++ compilation.

Duplicate files, wrong includes, const-incorrect code...
---
 lib/tolua++/include/tolua++.h     | 4 ++--
 lib/tolua++/src/lib/tolua_event.h | 2 +-
 lib/tolua++/src/lib/tolua_map.c   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/tolua++/include/tolua++.h b/lib/tolua++/include/tolua++.h
index 3ebd8d246..8da427fe3 100644
--- a/lib/tolua++/include/tolua++.h
+++ b/lib/tolua++/include/tolua++.h
@@ -43,8 +43,8 @@ extern "C" {
 
 typedef int lua_Object;
 
-#include "../../lua/src/lua.h"
-#include "../../lua/src/lauxlib.h"
+#include "lua/src/lua.h"
+#include "lua/src/lauxlib.h"
 
 struct tolua_Error
 {
diff --git a/lib/tolua++/src/lib/tolua_event.h b/lib/tolua++/src/lib/tolua_event.h
index 898f33dfc..d6b071152 100644
--- a/lib/tolua++/src/lib/tolua_event.h
+++ b/lib/tolua++/src/lib/tolua_event.h
@@ -15,7 +15,7 @@
 #ifndef TOLUA_EVENT_H
 #define TOLUA_EVENT_H
 
-#include "tolua++.h"
+#include "../../include/tolua++.h"
 
 TOLUA_API void tolua_moduleevents (lua_State* L);
 TOLUA_API int tolua_ismodulemetatable (lua_State* L);
diff --git a/lib/tolua++/src/lib/tolua_map.c b/lib/tolua++/src/lib/tolua_map.c
index 7c4a22336..937229610 100644
--- a/lib/tolua++/src/lib/tolua_map.c
+++ b/lib/tolua++/src/lib/tolua_map.c
@@ -25,7 +25,7 @@
 /* Create metatable
 	* Create and register new metatable
 */
-static int tolua_newmetatable (lua_State* L, char* name)
+static int tolua_newmetatable (lua_State* L, const char * name)
 {
 	int r = luaL_newmetatable(L,name);
 
-- 
cgit v1.2.3