From 6cb310c38c2708f724ab16896233fa665e17081b Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 7 Nov 2020 08:45:26 -0500 Subject: [PATCH] emul+cvm: link to curses instead of ncurses NetBSD doesn't have ncurses. Linking to curses doesn't seem to change anything. Tried on OpenBSD and Ubuntu. --- cvm/Makefile | 2 +- cvm/README.md | 3 +-- emul/8086/Makefile | 4 ++-- emul/8086/README.md | 3 +-- emul/z80/Makefile | 2 +- emul/z80/README.md | 3 +-- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/cvm/Makefile b/cvm/Makefile index 0dfd574..528845a 100644 --- a/cvm/Makefile +++ b/cvm/Makefile @@ -19,7 +19,7 @@ blkfs: $(BLKPACK) $(BLKPACK) ../blk > $@ forth: forth.c $(OBJS) - $(CC) -DBLKFS_PATH=\"`pwd`/blkfs\" forth.c $(OBJS) -lncurses -o $@ + $(CC) -DBLKFS_PATH=\"`pwd`/blkfs\" forth.c $(OBJS) -lcurses -o $@ vm.o: vm.c blkfs $(CC) -DFBIN_PATH=\"`pwd`/forth.bin\" -c -o vm.o vm.c diff --git a/cvm/README.md b/cvm/README.md index f6627dd..a94b619 100644 --- a/cvm/README.md +++ b/cvm/README.md @@ -5,8 +5,7 @@ to run natively on any POSIX environment. ## Requirements -You need `ncurses` to build the `forth` executable. In debian-based distros, -it's `libncurses5-dev`. +You need `curses` to build the `forth` executable. ## Build diff --git a/emul/8086/Makefile b/emul/8086/Makefile index 5932159..61cab8b 100644 --- a/emul/8086/Makefile +++ b/emul/8086/Makefile @@ -8,13 +8,13 @@ BLKFS = $(CDIR)/blkfs all: $(TARGETS) forth: forth.c forth.bin $(OBJS) $(BLKFS) - $(CC) -DFBIN_PATH=\"`pwd`/forth.bin\" -DBLKFS_PATH=\"`pwd`/$(BLKFS)\" forth.c $(OBJS) -lncurses -o $@ + $(CC) -DFBIN_PATH=\"`pwd`/forth.bin\" -DBLKFS_PATH=\"`pwd`/$(BLKFS)\" forth.c $(OBJS) -lcurses -o $@ forth.bin: xcomp.fs $(STAGE) $(CDIR)/stage < xcomp.fs > $@ pcat: pcat.c $(OBJS) $(BLKFS) - $(CC) -DBLKFS_PATH=\"`pwd`/$(BLKFS)\" pcat.c $(OBJS) -lncurses -o $@ + $(CC) -DBLKFS_PATH=\"`pwd`/$(BLKFS)\" pcat.c $(OBJS) -lcurses -o $@ $(BLKFS): $(STAGE) diff --git a/emul/8086/README.md b/emul/8086/README.md index f4d2413..216a70a 100644 --- a/emul/8086/README.md +++ b/emul/8086/README.md @@ -11,8 +11,7 @@ it only cover Collapse OS' own needs. ## Requirements -You need `ncurses` to build the `forth` executable. In debian-based distros, -it's `libncurses5-dev`. +You need `curses` to build the `forth` executable. ## Build diff --git a/emul/z80/Makefile b/emul/z80/Makefile index d686167..99e2b03 100644 --- a/emul/z80/Makefile +++ b/emul/z80/Makefile @@ -11,7 +11,7 @@ BLKFS = $(CDIR)/blkfs all: $(TARGETS) forth: forth.c $(OBJS) $(BLKFS) - $(CC) forth.c $(OBJS) -lncurses -o $@ + $(CC) forth.c $(OBJS) -lcurses -o $@ rc2014: rc2014.c $(RC2014_OBJS) $(CC) rc2014.c $(RC2014_OBJS) -o $@ diff --git a/emul/z80/README.md b/emul/z80/README.md index 090882a..8bc9f64 100644 --- a/emul/z80/README.md +++ b/emul/z80/README.md @@ -5,8 +5,7 @@ emulator. ## Requirements -You need `ncurses` to build the `forth` executable. In debian-based distros, -it's `libncurses5-dev`. +You need `curses` to build the `forth` executable. For `sms` and `ti84` emulators, you need XCB and pkg-config.