diff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-07-27 22:03:45 (GMT) | 
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-07-27 22:03:45 (GMT) | 
| commit | ca5c7b0a957e651b12083a43e700a19d54fd1016 (patch) | |
| tree | c781f240380368950df5335aab32978cd7121b0e /3rdParty/Lua/SConscript | |
| parent | 6f26d9aa86f0909af13b23b1a925b8d492e74154 (diff) | |
| download | swift-contrib-ca5c7b0a957e651b12083a43e700a19d54fd1016.zip swift-contrib-ca5c7b0a957e651b12083a43e700a19d54fd1016.tar.bz2  | |
First bash at integrating luasocket into Sluift
Diffstat (limited to '3rdParty/Lua/SConscript')
| -rw-r--r-- | 3rdParty/Lua/SConscript | 23 | 
1 files changed, 21 insertions, 2 deletions
diff --git a/3rdParty/Lua/SConscript b/3rdParty/Lua/SConscript index 68f4e36..587f2c1 100644 --- a/3rdParty/Lua/SConscript +++ b/3rdParty/Lua/SConscript @@ -17,6 +17,7 @@ if env.get("LUA_BUNDLED", False) :  		else :  			cppdefines += ["LUA_USE_POSIX", "LUA_USE_DLOPEN"] +		cppdefines += ["LUA_HAVE_SOCKET"]  		env["LUA_FLAGS"] = {  				"CPPDEFINES": cppdefines,  				"CPPPATH": [Dir("src")], @@ -38,7 +39,7 @@ if env.get("LUA_BUNDLED", False) :  		# Remove warn flags  		myenv.Replace(CCFLAGS = [flag for flag in env["CCFLAGS"] if flag not in ["-W", "-Wall"]])  		myenv.MergeFlags(myenv["LUA_FLAGS"]) -		myenv.StaticLibrary("Swiften_Lua", [ +		lua_sources = [  			"src/lapi.c",  			"src/lcode.c",  			"src/ldebug.c", @@ -67,7 +68,25 @@ if env.get("LUA_BUNDLED", False) :  			"src/ltablib.c",  			"src/lstrlib.c",  			"src/loadlib.c", -		]) +		] + +		luasocket_sources = [ +			"luasocket/src/luasocket.c", +			"luasocket/src/timeout.c", +			"luasocket/src/buffer.c", +			"luasocket/src/io.c", +			"luasocket/src/auxiliar.c", +			"luasocket/src/options.c", +			"luasocket/src/inet.c", +			"luasocket/src/tcp.c", +			"luasocket/src/udp.c", +			"luasocket/src/except.c", +			"luasocket/src/select.c", +			"luasocket/src/usocket.c", +			"luasocket/src/unix.c", +			"luasocket/src/mime.c", +		] +		myenv.StaticLibrary("Swiften_Lua", lua_sources + luasocket_sources)  		lua_env = myenv.Clone()  		lua_env.MergeFlags(lua_env["LUA_FLAGS"])  | 
 Swift