diff --git a/.gitignore b/.gitignore index deeaa03c..9c452a72 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ skynet 3rd/lua/luac cservice luaclib +*.so +*.dSYM diff --git a/Makefile b/Makefile index 501171c8..35ecd4a1 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ $(LUA_CLIB_PATH)/netpack.so : lualib-src/lua-netpack.c | $(LUA_CLIB_PATH) $(CC) $(CFLAGS) $(SHARED) $^ -Iskynet-src -o $@ $(LUA_CLIB_PATH)/cjson.so : | $(LUA_CLIB_PATH) - cd 3rd/lua-cjson && $(MAKE) LUA_INCLUDE_DIR=$(LUA_INC) CC=$(CC) && cp cjson.so ../../$@ + cd 3rd/lua-cjson && $(MAKE) LUA_INCLUDE_DIR=$(LUA_INC) CC=$(CC) CJSON_LDFLAGS="$(SHARED)" && cp cjson.so ../../$@ $(LUA_CLIB_PATH)/clientsocket.so : lualib-src/lua-clientsocket.c | $(LUA_CLIB_PATH) $(CC) $(CFLAGS) $(SHARED) $^ -o $@ -lpthread