akkartik
/
teliva
1
1
Fork 0
Code Issues Pull Requests Releases Activity

drop USE_LINUX and similar defines 

How many levels of macros do we need. Also stop lying that we're using
Linux in BSD.
This commit is contained in:
Kartik K. Agaram 2022-02-06 13:06:27 -08:00
parent c101d1a3c5
commit 467ce31371
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -87,7 +87,7 @@ ansi:
freebsd:
$(MAKE) -C luasocket bsd
$(MAKE) -C luasec bsd
$(MAKE) all MYCFLAGS="-DLUA_USE_LINUX" MYLIBS="-Wl,-E -lncursesw"
$(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lncursesw"
generic:
$(MAKE) all MYCFLAGS=
@ -96,15 +96,15 @@ linux:
$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
$(MAKE) -C luasocket linux
$(MAKE) -C luasec linux
$(MAKE) all MYCFLAGS="-Wpedantic -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lncursesw"
$(MAKE) all MYCFLAGS="-Wpedantic -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -ldl -lncursesw"
macosx:
$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
$(MAKE) -C luasocket macosx
$(MAKE) -C luasec macosx
$(MAKE) all MYCFLAGS="-Wpedantic -DLUA_USE_LINUX" MYLIBS="-L/usr/local/opt/openssl@3/lib -lncurses"
$(MAKE) all MYCFLAGS="-Wpedantic -DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-L/usr/local/opt/openssl@3/lib -lncurses"
# use this on Mac OS X 10.3-
# $(MAKE) all MYCFLAGS=-DLUA_USE_MACOSX
# $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_DL_DYLD"
openbsd:
$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"

11
src/luaconf.h
View File

@ -33,17 +33,6 @@
#define LUA_WIN
#endif
#if defined(LUA_USE_LINUX)
#define LUA_USE_POSIX
#define LUA_USE_DLOPEN /* needs an extra library: -ldl */
#endif
#if defined(LUA_USE_MACOSX)
#define LUA_USE_POSIX
#define LUA_DL_DYLD /* does not need extra library */
#endif
/*
@@ LUA_USE_POSIX includes all functionallity listed as X/Open System