aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--makefile2
-rw-r--r--src/lua/makefile4
2 files changed, 2 insertions, 4 deletions
diff --git a/makefile b/makefile
index 559552b..0c29230 100644
--- a/makefile
+++ b/makefile
@@ -18,7 +18,7 @@ DCOMPILE_FLAGS = -D DEBUG
18# Add additional include paths 18# Add additional include paths
19INCLUDES = -I $(SRC_PATH) -I ./src/lua 19INCLUDES = -I $(SRC_PATH) -I ./src/lua
20# General linker settings 20# General linker settings
21LINK_FLAGS = -L ./src/lua -lpthread -llua -ldl -lreadline 21LINK_FLAGS = -L ./src/lua -lpthread -llua -ldl
22# Additional release-specific linker settings 22# Additional release-specific linker settings
23RLINK_FLAGS = 23RLINK_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
55MYCFLAGS= $(LOCAL) -std=c99 -DLUA_USE_READLINE 55MYCFLAGS= $(LOCAL) -std=c99
56MYLIBS= -ldl -lreadline
57 56
58UNAME_S:=$(shell uname -s) 57UNAME_S:=$(shell uname -s)
59ifeq ($(UNAME_S),Darwin) 58ifeq ($(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