diff options
| author | jacob1 <jfu614@gmail.com> | 2013-05-17 16:44:25 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2013-05-17 16:44:25 (GMT) |
| commit | 981f6984c2c0f87d54a9c90f4518c69c9ef02ae0 (patch) | |
| tree | 757bd699a23c1fad61e60700265a25feb1a3042c /src/socket/socket.lua.cpp | |
| parent | cbd402d8cb6aa699ffde83a1b5b3c2f4fc51baaf (diff) | |
| parent | 77bf649fb4482c86ac1fd9b3233f062b53226007 (diff) | |
| download | powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.zip powder-981f6984c2c0f87d54a9c90f4518c69c9ef02ae0.tar.gz | |
Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git
Diffstat (limited to 'src/socket/socket.lua.cpp')
| -rw-r--r-- | src/socket/socket.lua.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/socket/socket.lua.cpp b/src/socket/socket.lua.cpp index 80b32f7..4952cce 100644 --- a/src/socket/socket.lua.cpp +++ b/src/socket/socket.lua.cpp @@ -1,3 +1,4 @@ +#ifdef LUACONSOLE // socket.lua from luasocket compiled into a cpp file extern "C" { #include "lua.h" @@ -10,3 +11,4 @@ void luaopen_socket(lua_State *l){ luaL_loadbuffer(l, socket_luac, socket_luac_sz, "@builtin socket.lua"); lua_call(l, 0, 0); } +#endif |