From ff43b5bae133c4f9b4d85cc9269581418fcc6ef3 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 27 Nov 2021 00:41:17 -0800 Subject: fix build on Mac --- src/Makefile | 2 ++ src/lcurses/curses.c | 3 +++ src/luasec/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Makefile b/src/Makefile index 046733f..29bdb79 100644 --- a/src/Makefile +++ b/src/Makefile @@ -99,6 +99,8 @@ linux: $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-Wl,-E -ldl -lncursesw" macosx: + make -C luasocket macosx + make -C luasec macosx $(MAKE) all MYCFLAGS=-DLUA_USE_LINUX MYLIBS="-lncurses" # use this on Mac OS X 10.3- # $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX diff --git a/src/lcurses/curses.c b/src/lcurses/curses.c index a7b22b6..f6b425d 100644 --- a/src/lcurses/curses.c +++ b/src/lcurses/curses.c @@ -81,7 +81,10 @@ #include "_helpers.c" + +#ifdef __linux__ #include "strlcpy.c" +#endif #include "chstr.c" #include "window.c" diff --git a/src/luasec/Makefile b/src/luasec/Makefile index b1ed738..732bb3e 100644 --- a/src/luasec/Makefile +++ b/src/luasec/Makefile @@ -17,8 +17,8 @@ BSD_LDFLAGS=-O -fPIC -shared linux_CFLAGS=-g -O2 $(WARN) $(DEFS) macosx_ENV=env MACOSX_DEPLOYMENT_TARGET='$(MACVER)' -macosx_CFLAGS=-O2 -fno-common $(WARN) $(DEFS) -macosx_LDFLAGS=-bundle -undefined dynamic_lookup +macosx_CFLAGS=-O2 -fno-common $(WARN) $(DEFS) -I/usr/local/opt/openssl@3/include +macosx_LDFLAGS=-bundle -undefined dynamic_lookup -L/usr/local/opt/openssl@3/lib INSTALL = install CC = gcc -- cgit 1.4.1-2-gfad0