From ec1f6c99633df0c54bdf3ee0aa1878c74e84d3e9 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 16 Apr 2006 13:04:52 +0000 Subject: [PATCH] lua-gmtool kompiliert unter linux --- src/eressea/Jamfile | 2 +- src/eressea/console.c | 4 ++-- src/eressea/gmtool.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile index 6125995a2..465ce028b 100644 --- a/src/eressea/Jamfile +++ b/src/eressea/Jamfile @@ -68,5 +68,5 @@ LinkLibraries $(GMTOOL) : kernel modules items attributes spells races triggers util ; luabind $(GMTOOL) ; libxml2 $(GMTOOL) ; -LINKLIBS on $(GMTOOL) += -lm -lncurses ; +LINKLIBS on $(GMTOOL) += -lm -lncurses -ldl -lstdc++ ; Main $(GMTOOL) : $(GMTOOL_SOURCES) ; diff --git a/src/eressea/console.c b/src/eressea/console.c index ace0f41a3..84fe5322a 100644 --- a/src/eressea/console.c +++ b/src/eressea/console.c @@ -168,8 +168,8 @@ lua_console(lua_State * L) lua_getglobal(L, "print"); lua_insert(L, 1); if (lua_pcall(L, lua_gettop(L)-1, 0, 0) != 0) - l_message(NULL, lua_pushfstring(L, "error calling `print' (%s)", - lua_tostring(L, -1))); + l_message(NULL, lua_pushfstring(L, "error calling `print' (%s)", + lua_tostring(L, -1))); } } lua_settop(L, 0); /* clear stack */ diff --git a/src/eressea/gmtool.h b/src/eressea/gmtool.h index edeaab65f..9699213e1 100644 --- a/src/eressea/gmtool.h +++ b/src/eressea/gmtool.h @@ -14,7 +14,7 @@ #ifdef __cplusplus extern "C" { #endif - + struct lua_State; extern int gmmain(int argc, char *argv[]); extern int curses_readline(struct lua_State * L, const char * prompt); @@ -22,5 +22,4 @@ extern "C" { } #endif - #endif