socket and lanes

git-svn-id: http://svn.net-core.org/repos/t-engine4@160 51575b47-30f0-44d4-a5cc-537603b46e54

game/engine/pre-init.lua

+-- Requiring "socketed" instead of "socket" makes sockets work
+-- Thsi is due to the way luasocket is embeded statically in TE4
+require "socketed"

game/thirdparty/socket.lua

@@ -10,7 +10,7 @@
 local base = _G
 local string = require("string")
 local math = require("math")
-local socket = require("socket.core")
+local socket = require("socket")
 module("socket")
 
 -----------------------------------------------------------------------------

game/thirdparty/socketed.lua

+local print = print
+local dofile = dofile
+local socket = require("socket")
+
+module("socketed")
+
+if not socket.connect then
+	print("First Socket require")
+	dofile("/socket.lua")
+end
+
+return socket

premake4.lua

@@ -33,7 +33,7 @@ project "TEngine"
 	language "C"
 	targetname "t-engine"
 	files { "src/*.c", }
-	links { "physfs", "lua", "fov", "luasocket", "luaprofiler" }
+	links { "physfs", "lua", "fov", "luasocket", "luaprofiler", "lualanes" }
 	defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
 	defines { [[TENGINE_HOME_PATH='".t-engine"']] }
 
@@ -143,3 +143,10 @@ project "luaprofiler"
 	targetname "luaprofiler"
 
 	files { "src/luaprofiler/*.c", }
+
+project "lualanes"
+	kind "StaticLib"
+	language "C"
+	targetname "lualanes"
+
+	files { "src/lualanes/*.c", }

src/main.c

@@ -397,6 +397,7 @@ int main(int argc, char *argv[])
 	luaopen_mime_core(L);
 	luaopen_struct(L);
 	luaopen_profiler(L);
+	luaopen_lanes(L);
 	luaopen_map(L);
 
 	// Make the uids repository
@@ -423,6 +424,10 @@ int main(int argc, char *argv[])
 		PHYSFS_mount("game/", "/", 1);
 	}
 
+	// And run the lua engine pre init scripts
+	luaL_loadfile(L, "/engine/pre-init.lua");
+	docall(L, 0, 0);
+
 	// initialize engine and set up resolution and depth
 	Uint32 flags=SDL_INIT_VIDEO | SDL_INIT_TIMER;
 	if (SDL_Init (flags) < 0) {