From bca009bf32ecc590fbab894dace4a4d487285be9 Mon Sep 17 00:00:00 2001 From: Cloud Wu Date: Wed, 26 Mar 2014 18:03:38 +0800 Subject: [PATCH] LUA_LIB can be override --- Makefile | 6 +++--- README.md | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 618e1a41..61e1c252 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ none : @echo "Please do 'make PLATFORM' where PLATFORM is one of these:" @echo " $(PLATS)" -LUA_STATICLIB ?= 3rd/lua/liblua.a +LUA_STATICLIB = 3rd/lua/liblua.a +LUA_LIB ?= $(LUA_STATICLIB) LUA_INC ?= -I3rd/lua LUA_CLIB_PATH ?= luaclib CSERVICE_PATH ?= cservice SKYNET_BUILD_PATH ?= . -LUA_LIB = $(LUA_STATICLIB) CFLAGS = -g -Wall $(LUA_INC) $(MYCFLAGS) @@ -57,7 +57,7 @@ all : \ $(foreach v, $(CSERVICE), $(CSERVICE_PATH)/$(v).so) \ $(foreach v, $(LUA_CLIB), $(LUA_CLIB_PATH)/$(v).so) -$(SKYNET_BUILD_PATH)/skynet : $(foreach v, $(SKYNET_SRC), skynet-src/$(v)) $(LUA_STATICLIB) +$(SKYNET_BUILD_PATH)/skynet : $(foreach v, $(SKYNET_SRC), skynet-src/$(v)) $(LUA_LIB) gcc $(CFLAGS) -o $@ $^ -Iskynet-src $(LDFLAGS) $(EXPORT) $(LIBS) $(LUA_CLIB_PATH) : diff --git a/README.md b/README.md index 0567b45a..130184b3 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,13 @@ make 'PLATFORM' # PLATFORM can be linux, macosx, freebsd now ``` +Or you can : + +``` +export PLAT=linux +make +``` + ## Test Run these in different console