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 /Sluift | |
| parent | f51dbfa74459b07487a4f13bf037564ebb8cd506 (diff) | |
| download | swift-contrib-36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73.zip swift-contrib-36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73.tar.bz2 | |
Compile Lua as C++ to avoid setjmp/longjmp & exception conflicts.
Diffstat (limited to 'Sluift')
| -rw-r--r-- | Sluift/Lua/Value.cpp | 4 | ||||
| -rw-r--r-- | Sluift/SConscript | 4 | ||||
| -rw-r--r-- | Sluift/sluift.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Sluift/Lua/Value.cpp b/Sluift/Lua/Value.cpp index c03e633..3164ec6 100644 --- a/Sluift/Lua/Value.cpp +++ b/Sluift/Lua/Value.cpp @@ -6,9 +6,7 @@ #include "Value.h" -extern "C" { - #include <lualib.h> -} +#include <lualib.h> #include <boost/variant/apply_visitor.hpp> #include <Swiften/Base/foreach.h> diff --git a/Sluift/SConscript b/Sluift/SConscript index 19255f1..6897f6d 100644 --- a/Sluift/SConscript +++ b/Sluift/SConscript @@ -22,6 +22,10 @@ if env["SCONS_STAGE"] == "build" : myenv.Append(CPPDEFINES = ["SLUIFT_BUILD_DLL"]) elif myenv["PLATFORM"] == "darwin" : myenv["SHLIBSUFFIX"] = ".so" + if env["PLATFORM"] == "win32" : + myenv.Append(CFLAGS = ["/TP"]) + else : + myenv.Append(CFLAGS = ["-x", "c++"]) myenv["SLUIFT_VERSION"] = Version.getBuildVersion("sluift") def patchLua(env, target, source) : diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp index 2ef5f9e..260c923 100644 --- a/Sluift/sluift.cpp +++ b/Sluift/sluift.cpp @@ -4,10 +4,8 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ -extern "C" { - #include "sluift.h" - #include <lauxlib.h> -} +#include "sluift.h" +#include <lauxlib.h> #include <iostream> #include <string> |