diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2021-11-27 00:41:17 -0800 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2021-11-27 00:41:17 -0800 |
commit | ff43b5bae133c4f9b4d85cc9269581418fcc6ef3 (patch) | |
tree | a5d69ea9d9a1ed9e3aa3c448186684036361ce74 /src | |
parent | 83050ec38ec5f2b1cf06a077cc44b2bce5f90d57 (diff) | |
download | teliva-ff43b5bae133c4f9b4d85cc9269581418fcc6ef3.tar.gz |
fix build on Mac
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile | 2 | ||||
-rw-r--r-- | src/lcurses/curses.c | 3 | ||||
-rw-r--r-- | src/luasec/Makefile | 4 |
3 files changed, 7 insertions, 2 deletions
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 |