summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-08-16 21:11:56 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-08-17 09:32:03 (GMT)
commit92ffd5b909badeafabbf73b73a6946a5440c8be5 (patch)
treea33a6086ace038c63751403ae29573ae161846b2 /3rdParty/Lua
parentac6ff12e174b832326c6d89784d4c5e53044eecf (diff)
downloadswift-contrib-92ffd5b909badeafabbf73b73a6946a5440c8be5.zip
swift-contrib-92ffd5b909badeafabbf73b73a6946a5440c8be5.tar.bz2
Fix building sluift as .dll on Mac OS X.
Change-Id: Ia8043d66ef676048e7fe1d0347b65e8d64aa3bd5
Diffstat (limited to '3rdParty/Lua')
-rw-r--r--3rdParty/Lua/SConscript4
-rw-r--r--3rdParty/Lua/src/lua.hpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/3rdParty/Lua/SConscript b/3rdParty/Lua/SConscript
index acb2fba..f73286f 100644
--- a/3rdParty/Lua/SConscript
+++ b/3rdParty/Lua/SConscript
@@ -31,10 +31,6 @@ 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 not flag.startswith("-W")])
diff --git a/3rdParty/Lua/src/lua.hpp b/3rdParty/Lua/src/lua.hpp
new file mode 100644
index 0000000..5060a4e
--- /dev/null
+++ b/3rdParty/Lua/src/lua.hpp
@@ -0,0 +1,5 @@
+extern "C" {
+#include "lua.h"
+#include "lualib.h"
+#include "lauxlib.h"
+}