lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

move so from lualib to luaclib

Browse Source
This commit is contained in:
云风
2012-09-05 12:22:29 +08:00
parent 2cc2ca05c2
commit 2126f54d72
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@@ -7,17 +7,17 @@ all : \
skynet \
service/snlua.so \
service/logger.so \
lualib/skynet.so \
service/gate.so \
service/client.so \
service/connection.so \
client \
lualib/socket.so \
lualib/int64.so \
service/master.so \
service/multicast.so \
service/tunnel.so \
service/harbor.so
service/harbor.so \
luaclib/skynet.so \
luaclib/socket.so \
luaclib/int64.so \
client
skynet : \
skynet-src/skynet_main.c \
@@ -34,6 +34,9 @@ skynet : \
skynet-src/skynet_env.c
gcc $(CFLAGS) -Wl,-E -o $@ $^ -Iskynet-src -lpthread -ldl -lrt -Wl,-E -llua -lm
luaclib:
mkdir luaclib
service/tunnel.so : service-src/service_tunnel.c
gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
@@ -55,7 +58,7 @@ service/snlua.so : service-src/service_lua.c
service/gate.so : gate/mread.c gate/ringbuffer.c gate/main.c
gcc $(CFLAGS) $(SHARED) $^ -o $@ -Igate -Iskynet-src
lualib/skynet.so : lualib-src/lua-skynet.c lualib-src/lua-seri.c lualib-src/lua-remoteobj.c
luaclib/skynet.so : lualib-src/lua-skynet.c lualib-src/lua-seri.c lualib-src/lua-remoteobj.c | luaclib
gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
service/client.so : service-src/service_client.c
@@ -64,15 +67,15 @@ service/client.so : service-src/service_client.c
service/connection.so : connection/connection.c connection/main.c
gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iconnection
lualib/socket.so : connection/lua-socket.c
luaclib/socket.so : connection/lua-socket.c | luaclib
gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iconnection
lualib/int64.so : lua-int64/int64.c
luaclib/int64.so : lua-int64/int64.c | luaclib
gcc $(CFLAGS) $(SHARED) -O2 $^ -o $@
client : client-src/client.c
gcc $(CFLAGS) $^ -o $@ -lpthread
clean :
rm skynet client lualib/*.so service/*.so
rm skynet client service/*.so luaclib/*.so

2
skynet-src/skynet_main.c
View File

@@ -96,7 +96,7 @@ main(int argc, char *argv[]) {
const char *path = optstring("lua_path","./lualib/?.lua;./lualib/?/init.lua");
setenv("LUA_PATH",path,1);
const char *cpath = optstring("lua_cpath","./lualib/?.so");
const char *cpath = optstring("lua_cpath","./luaclib/?.so");
setenv("LUA_CPATH",cpath,1);
optstring("luaservice","./service/?.lua");