diff --git a/Makefile b/Makefile index c7e1e2d..221c458 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ SRCS = $(EDITOR) dgl-common.c ttyrec.c dgamelaunch.c io.c ttyplay.c mygetnstr.c EXTRA_SRCS = nethackstub.c OBJS = $(SRCS:.c=.o) WALL_OBJS = y.tab.o lex.yy.o dgl-common.o dgl-wall.o strlcat.o strlcpy.o -LIBS = -lcurses -lcrypt $(LUTIL) -ll +LIBS = -lcurses $(LUTIL) -ll all: $(NAME) dgl-wall diff --git a/config.y b/config.y index 6fddb60..ead0bb9 100644 --- a/config.y +++ b/config.y @@ -1,5 +1,7 @@ %{ +#include + #include #include #include diff --git a/dgamelaunch.c b/dgamelaunch.c index 19cbed7..2e43950 100644 --- a/dgamelaunch.c +++ b/dgamelaunch.c @@ -44,7 +44,6 @@ /* ************************************************************* */ /* program stuff */ - #include #include #include @@ -55,16 +54,22 @@ #include #ifndef __FreeBSD__ -# include +# ifdef __APPLE__ +# include +# else +# include +# endif #else # include #endif + + #ifdef __linux__ # include #endif -#ifndef ARRAY_SIZE +#ifndef ARRAY_SIZEK # define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) #endif diff --git a/dgl-create-chroot b/dgl-create-chroot index 1efeea0..f0e0f6a 100755 --- a/dgl-create-chroot +++ b/dgl-create-chroot @@ -17,11 +17,11 @@ libs="" # (leave blank to skip) compress_bin="gzip" # nethack binary to copy (leave blank to skip) -nethack_bin="/usr/lib/games/nethack/nethack-console" +nethack_bin="/opt/local/bin/nethack" # fixed data to copy (leave blank to skip) -playground_fixed="/usr/lib/games/nethack" +playground_fixed="/opt/local/share/nethackdir/" # variable data to create (leave blank to skip) (may be equal to previous) -playground_var="/var/games/nethack" +playground_var="" # termcap/terminfo (copied recursively) (leave blank to skip) termdata="/usr/share/terminfo"