diff options
author | Remko Tronçon <git@el-tramo.be> | 2013-08-16 21:11:56 (GMT) |
---|---|---|
committer | Remko Tronçon <git@el-tramo.be> | 2013-08-17 09:32:03 (GMT) |
commit | 92ffd5b909badeafabbf73b73a6946a5440c8be5 (patch) | |
tree | a33a6086ace038c63751403ae29573ae161846b2 /Swiftob | |
parent | ac6ff12e174b832326c6d89784d4c5e53044eecf (diff) | |
download | swift-92ffd5b909badeafabbf73b73a6946a5440c8be5.zip swift-92ffd5b909badeafabbf73b73a6946a5440c8be5.tar.bz2 |
Fix building sluift as .dll on Mac OS X.
Change-Id: Ia8043d66ef676048e7fe1d0347b65e8d64aa3bd5
Diffstat (limited to 'Swiftob')
-rw-r--r-- | Swiftob/LuaCommands.h | 4 | ||||
-rw-r--r-- | Swiftob/SConscript | 2 | ||||
-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 |