diff --git a/framework/lualib-src/lua-ecs/Makefile b/framework/lualib-src/lua-ecs/Makefile index 9a4e8f0..fc0d969 100755 --- a/framework/lualib-src/lua-ecs/Makefile +++ b/framework/lualib-src/lua-ecs/Makefile @@ -3,7 +3,7 @@ include $(SKYNET_ROOT)/platform.mk PLAT ?= none -TARGET = ../../luaclib/ecs.so +TARGET ?= ../../luaclib/ecs.so ifeq ($(PLAT), macosx) CFLAGS = -g -O2 -dynamiclib -Wl,-undefined,dynamic_lookup @@ -15,7 +15,6 @@ endif LUA_LIB ?= $(SKYNET_ROOT)/3rd/lua/ LUA_INC ?= $(SKYNET_ROOT)/3rd/lua/ -SKYNET_SRC ?= $(SKYNET_ROOT)/skynet-src SRC = . @@ -24,7 +23,7 @@ SRC = . all: $(TARGET) $(TARGET): $(foreach dir, $(SRC), $(wildcard $(dir)/*.c)) - $(CC) $(CFLAGS) $(SHARED) -I$(LUA_INC) -I$(SKYNET_SRC) $^ -o $@ + $(CC) $(CFLAGS) $(SHARED) -I$(LUA_INC) -DTEST_LUAECS $^ -o $@ clean: rm -f *.o $(TARGET) diff --git a/framework/lualib-src/testluaclib.lua b/framework/lualib-src/testluaclib.lua index 90bed98..cb1b67a 100644 --- a/framework/lualib-src/testluaclib.lua +++ b/framework/lualib-src/testluaclib.lua @@ -1,4 +1,4 @@ -package.path = "3rd/?.lua;lualib-src/?.lua;" .. package.path +package.path = "lualib/3rd/misc/?.lua;lualib-src/?.lua;" .. package.path package.cpath = ";luaclib/?.so;skynet/luaclib/?.so;" -- lua ffi εΊ“ @@ -50,3 +50,5 @@ print("ffi", ffi) local syslog = require 'lsyslog' print("syslog", syslog) + +require("lua-ecs.test")