Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-04-04 19:38:28 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-04-18 19:11:40 (GMT) |
| commit | 36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73 (patch) | |
| tree | f5aa249062b3f65318ead9cb6891980688754d43 /Swiftob | |
| parent | f51dbfa74459b07487a4f13bf037564ebb8cd506 (diff) | |
| download | swift-36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73.zip swift-36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73.tar.bz2 | |
Compile Lua as C++ to avoid setjmp/longjmp & exception conflicts.
Diffstat (limited to 'Swiftob')
| -rw-r--r-- | Swiftob/LuaCommands.h | 3 | ||||
| -rw-r--r-- | Swiftob/SConscript | 2 | ||||
| -rw-r--r-- | Swiftob/linit.cpp (renamed from Swiftob/linit.c) | 0 |
3 files changed, 1 insertions, 4 deletions
diff --git a/Swiftob/LuaCommands.h b/Swiftob/LuaCommands.h index dc8e36e..f506a70 100644 --- a/Swiftob/LuaCommands.h +++ b/Swiftob/LuaCommands.h @@ -9,12 +9,9 @@ #include <string> #include <vector> -extern "C" { #include <lua.h> #include <lauxlib.h> #include <lualib.h> -} - #include <boost/filesystem/fstream.hpp> #include <boost/noncopyable.hpp> #include "Swiften/Network/NetworkFactories.h" diff --git a/Swiftob/SConscript b/Swiftob/SConscript index 3928ff0..e955a22 100644 --- a/Swiftob/SConscript +++ b/Swiftob/SConscript @@ -14,7 +14,7 @@ if env["SCONS_STAGE"] == "build": myenv.MergeFlags(myenv["PLATFORM_FLAGS"]) myenv.MergeFlags(myenv.get("LUA_FLAGS", {})) sources = [ - "linit.c", # This is horrible! + "linit.cpp", "Swiftob.cpp", "Users.cpp", "Commands.cpp", diff --git a/Swiftob/linit.c b/Swiftob/linit.cpp index 13c5b09..13c5b09 100644 --- a/Swiftob/linit.c +++ b/Swiftob/linit.cpp |