summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiftob')
-rw-r--r--Swiftob/LuaCommands.h4
-rw-r--r--Swiftob/SConscript2
-rw-r--r--Swiftob/linit.c (renamed from Swiftob/linit.cpp)0
3 files changed, 2 insertions, 4 deletions
diff --git a/Swiftob/LuaCommands.h b/Swiftob/LuaCommands.h
index 97ea87c..c5f959d 100644
--- a/Swiftob/LuaCommands.h
+++ b/Swiftob/LuaCommands.h
@@ -9,9 +9,7 @@
#include <string>
#include <vector>
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
+#include <lua.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/noncopyable.hpp>
#include <Swiften/Network/NetworkFactories.h>
diff --git a/Swiftob/SConscript b/Swiftob/SConscript
index 424ae72..a830b84 100644
--- a/Swiftob/SConscript
+++ b/Swiftob/SConscript
@@ -13,7 +13,7 @@ elif env["SCONS_STAGE"] == "build":
myenv.UseFlags(myenv["SWIFTEN_FLAGS"])
myenv.UseFlags(myenv["SWIFTEN_DEP_FLAGS"])
sources = [
- "linit.cpp",
+ "linit.c",
"Swiftob.cpp",
"Users.cpp",
"Commands.cpp",
diff --git a/Swiftob/linit.cpp b/Swiftob/linit.c
index 13c5b09..13c5b09 100644
--- a/Swiftob/linit.cpp
+++ b/Swiftob/linit.c