summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-04 19:38:28 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-18 19:11:40 (GMT)
commit36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73 (patch)
treef5aa249062b3f65318ead9cb6891980688754d43 /3rdParty/Lua
parentf51dbfa74459b07487a4f13bf037564ebb8cd506 (diff)
downloadswift-36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73.zip
swift-36c2dbefc06607483eb0d309e3a9a4ad1f4f8f73.tar.bz2
Compile Lua as C++ to avoid setjmp/longjmp & exception conflicts.
Diffstat (limited to '3rdParty/Lua')
-rw-r--r--3rdParty/Lua/SConscript4
1 files changed, 4 insertions, 0 deletions
diff --git a/3rdParty/Lua/SConscript b/3rdParty/Lua/SConscript
index 3baa2d8..68f4e36 100644
--- a/3rdParty/Lua/SConscript
+++ b/3rdParty/Lua/SConscript
@@ -30,6 +30,10 @@ if env.get("LUA_BUNDLED", False) :
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
+ if env["PLATFORM"] == "win32" :
+ myenv.Append(CFLAGS = ["/TP"])
+ else :
+ myenv.Append(CFLAGS = ["-x", "c++"])
# Remove warn flags
myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])