aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2022-01-24 20:15:43 -0800
committerKartik K. Agaram <vc@akkartik.com>2022-01-24 20:15:43 -0800
commit6a33284b0745880a5e9bf7c78dfb6cadc8bbf28b (patch)
tree9441259d7f9da51efb46209ecfd2fcdfdf534dfa /src
parente4f934db6b1f014c22b706781bbf836d3316a672 (diff)
downloadteliva-6a33284b0745880a5e9bf7c78dfb6cadc8bbf28b.tar.gz
get Teliva running on NetBSD
NetBSD still uses curses by default. One _could_ install ncurses, but I don't have access to a NetBSD box with permissions to install ncurses, so I'm experimenting to see how far we can get with just curses. So far most of the apps seem to work, with the exception of one bug that I'll commit next.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile2
-rw-r--r--src/kilo.c4
-rw-r--r--src/lbaselib.c4
-rw-r--r--src/lcurses/_helpers.c4
-rw-r--r--src/lua.c4
-rw-r--r--src/teliva.c4
-rw-r--r--src/tlv.c4
7 files changed, 25 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile
index 6e537a8..8843669 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -119,7 +119,7 @@ netbsd:
$(MAKE) -C lcurses CC="$(CC)" CFLAGS="$(CFLAGS)"
$(MAKE) -C luasocket bsd
$(MAKE) -C luasec bsd
- $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lncurses"
+ $(MAKE) all MYCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN" MYLIBS="-Wl,-E -lcurses"
posix:
$(MAKE) all MYCFLAGS=-DLUA_USE_POSIX
diff --git a/src/kilo.c b/src/kilo.c
index f1e047e..9e1dfe6 100644
--- a/src/kilo.c
+++ b/src/kilo.c
@@ -37,7 +37,11 @@
#endif
#include <assert.h>
+#ifdef __NetBSD__
+#include <curses.h>
+#else
#include <ncurses.h>
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
diff --git a/src/lbaselib.c b/src/lbaselib.c
index fa597eb..2360357 100644
--- a/src/lbaselib.c
+++ b/src/lbaselib.c
@@ -7,7 +7,11 @@
#include <ctype.h>
+#ifdef __NetBSD__
+#include <curses.h>
+#else
#include <ncurses.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/lcurses/_helpers.c b/src/lcurses/_helpers.c
index c2a30b2..78457d6 100644
--- a/src/lcurses/_helpers.c
+++ b/src/lcurses/_helpers.c
@@ -21,7 +21,11 @@
#include <sys/stat.h>
#include <unistd.h> /* for _POSIX_VERSION */
+#ifdef __NetBSD__
+#include <curses.h>
+#else
#include <ncurses.h>
+#endif
#include <term.h>
#include "../lua.h"
diff --git a/src/lua.c b/src/lua.c
index 08a16a3..d2ef76e 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -6,7 +6,11 @@
#include <locale.h>
+#ifdef __NetBSD__
+#include <curses.h>
+#else
#include <ncurses.h>
+#endif
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/teliva.c b/src/teliva.c
index e3707b3..39a1d76 100644
--- a/src/teliva.c
+++ b/src/teliva.c
@@ -1,6 +1,10 @@
#include <assert.h>
#include <ctype.h>
+#ifdef __NetBSD__
+#include <curses.h>
+#else
#include <ncurses.h>
+#endif
#include <stdlib.h>
#include <string.h>
#include <time.h>
diff --git a/src/tlv.c b/src/tlv.c
index 8ef1512..59f2e43 100644
--- a/src/tlv.c
+++ b/src/tlv.c
@@ -1,5 +1,9 @@
#include <assert.h>
+#ifdef __NetBSD__
+#include <curses.h>
+#else
#include <ncurses.h>
+#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>