Skip to content

Commit

Permalink
upgrade skynet
Browse files Browse the repository at this point in the history
  • Loading branch information
lsg2020 committed Apr 15, 2022
1 parent 7daffa4 commit 9a29f36
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "skynet"]
path = skynet
url = https://github.com/lsg2020/skynet
[submodule "3rd/lua-cjson"]
path = 3rd/lua-cjson
url = https://github.com/cloudwu/lua-cjson
[submodule "3rd/luaprofile"]
path = 3rd/luaprofile
url = https://github.com/lsg2020/luaprofile
[submodule "skynet"]
path = skynet
url = https://github.com/cloudwu/skynet
2 changes: 1 addition & 1 deletion 3rd/luaprofile
Submodule luaprofile updated 1 files
+3 −0 profile.c
20 changes: 17 additions & 3 deletions Makefile
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
PLAT ?= none
PLATS = linux freebsd macosx

none :
@echo "Please do 'make PLATFORM' where PLATFORM is one of these:"
@echo " $(PLATS)"

.PHONY: all clean build skynet

BUILD_DIR = $(PWD)/build
BIN_DIR = $(BUILD_DIR)
CLUALIB_DIR = $(BUILD_DIR)/clualib
CSERVICE_DIR = $(BUILD_DIR)/cservice
PLAT = linux

linux : PLAT = linux
macosx : PLAT = macosx
freebsd : PLAT = freebsd
linux macosx freebsd: all

all: build

Expand Down Expand Up @@ -47,9 +58,12 @@ clean: clean-skynet
# 3rd
all: 3rd

linux: CFLAGS = -g3 -O2 -rdynamic -Wall -Iskynet/3rd/lua -Iskynet/skynet-src
linux: LDFLAGS += -lrt -pthread -lm -ldl
macosx: CFLAGS = -dynamiclib -Wl,-undefined,dynamic_lookup -g3 -O2 -rdynamic -Iskynet/3rd/lua -Iskynet/skynet-src
macosx: LDFLAGS += -pthread -lm -ldl

SHARED = -fPIC --shared
CFLAGS = -g3 -O2 -rdynamic -Wall -Iskynet/3rd/lua -Iskynet/skynet-src
LDFLAGS += -lrt -pthread -lm -ldl
CLUALIB=profile cjson
CSERVICE=

Expand Down
2 changes: 1 addition & 1 deletion skynet
Submodule skynet updated 134 files

0 comments on commit 9a29f36

Please sign in to comment.