diff options
| author | Li Jin <dragon-fly@qq.com> | 2020-06-22 17:41:30 +0800 |
|---|---|---|
| committer | Li Jin <dragon-fly@qq.com> | 2020-06-22 17:41:30 +0800 |
| commit | 67f500c4dbb202bc8b2d5d85f210665d82e613d6 (patch) | |
| tree | 5cd408787518ca197df1e0c6c99abe5e88edbdfd | |
| parent | a324a39a71b9ac403314627348322e51ed9b5dc0 (diff) | |
| download | yuescript-67f500c4dbb202bc8b2d5d85f210665d82e613d6.tar.gz yuescript-67f500c4dbb202bc8b2d5d85f210665d82e613d6.tar.bz2 yuescript-67f500c4dbb202bc8b2d5d85f210665d82e613d6.zip | |
fix.
| -rw-r--r-- | makefile | 2 | ||||
| -rw-r--r-- | src/lua/makefile | 4 |
2 files changed, 2 insertions, 4 deletions
| @@ -18,7 +18,7 @@ DCOMPILE_FLAGS = -D DEBUG | |||
| 18 | # Add additional include paths | 18 | # Add additional include paths |
| 19 | INCLUDES = -I $(SRC_PATH) -I ./src/lua | 19 | INCLUDES = -I $(SRC_PATH) -I ./src/lua |
| 20 | # General linker settings | 20 | # General linker settings |
| 21 | LINK_FLAGS = -L ./src/lua -lpthread -llua -ldl -lreadline | 21 | LINK_FLAGS = -L ./src/lua -lpthread -llua -ldl |
| 22 | # Additional release-specific linker settings | 22 | # Additional release-specific linker settings |
| 23 | RLINK_FLAGS = | 23 | RLINK_FLAGS = |
| 24 | # Additional debug-specific linker settings | 24 | # Additional debug-specific linker settings |
diff --git a/src/lua/makefile b/src/lua/makefile index 470446f..c4b0064 100644 --- a/src/lua/makefile +++ b/src/lua/makefile | |||
| @@ -52,8 +52,7 @@ LOCAL = $(CWARNS) | |||
| 52 | 52 | ||
| 53 | 53 | ||
| 54 | # enable Linux goodies | 54 | # enable Linux goodies |
| 55 | MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_READLINE | 55 | MYCFLAGS= $(LOCAL) -std=c99 |
| 56 | MYLIBS= -ldl -lreadline | ||
| 57 | 56 | ||
| 58 | UNAME_S:=$(shell uname -s) | 57 | UNAME_S:=$(shell uname -s) |
| 59 | ifeq ($(UNAME_S),Darwin) | 58 | ifeq ($(UNAME_S),Darwin) |
| @@ -123,7 +122,6 @@ echo: | |||
| 123 | @echo "RM = $(RM)" | 122 | @echo "RM = $(RM)" |
| 124 | @echo "MYCFLAGS = $(MYCFLAGS)" | 123 | @echo "MYCFLAGS = $(MYCFLAGS)" |
| 125 | @echo "MYLDFLAGS = $(MYLDFLAGS)" | 124 | @echo "MYLDFLAGS = $(MYLDFLAGS)" |
| 126 | @echo "MYLIBS = $(MYLIBS)" | ||
| 127 | @echo "DL = $(DL)" | 125 | @echo "DL = $(DL)" |
| 128 | 126 | ||
| 129 | $(ALL_O): makefile | 127 | $(ALL_O): makefile |