hints for linux X11; typo fix (trunk only)

Add hints file for single-user linux X11.
Fix typo in macos-x11.
nethack.sh: don't run xset unless $DISPLAY is set
This commit is contained in:
keni
2007-12-16 15:38:21 +00:00
parent bd0d01b73d
commit f0abeacb41
3 changed files with 34 additions and 2 deletions

32
sys/unix/hints/linux-x11 Normal file
View File

@@ -0,0 +1,32 @@
#
# SCCS Id: @(#)linux 3.5 2007/12/16
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
# NetHack may be freely redistributed. See license for details.
#
# Linux hints file
# This hints file provides a single-user x11 build for Linux, specifically
# for Ubuntu dapper.
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
#PREFIX=/usr
PREFIX=$(wildcard ~)/nh/install
CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1) $(CFLAGS3)
CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
CFLAGS3=-DX11_GRAPHICS -DDEFAULT_WINDOW_SYS=\"X11\" -DNOTTYGRAPHICS
WINSRC = $(WINX11SRC)
WINOBJ = $(WINX11OBJ)
WINLIB = $(WINX11LIB)
VARDATND = x11tiles NetHack.ad pet_mark.xbm
#WINTTYLIB=-lcurses
CHOWN=true
CHGRP=true
POSTINSTALL= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir)
# note: needs libxt-dev libxaw7-dev libx11-dev bdftopcf

View File

@@ -37,4 +37,4 @@ VARDATND = x11tiles NetHack.ad pet_mark.xbm
# XXX install nethack.rc as .nethackrc
POSTINSTALL= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcd; (cd $(HACKDIR); mkfontdir)
POSTINSTALL= bdftopcf win/X11/nh10.bdf > $(HACKDIR)/nh10.pcf; (cd $(HACKDIR); mkfontdir)

View File

@@ -16,7 +16,7 @@ esac
export XUSERFILESEARCHPATH
# Get font dir added, but only once (and only if there's an xset to be found).
test -e $HACKDIR/fonts.dir && xset p >/dev/null 2>&1 && (
test -n "$DISPLAY" -a -e $HACKDIR/fonts.dir && xset p >/dev/null 2>&1 && (
xset fp- $HACKDIR >/dev/null 2>&1;
xset fp+ $HACKDIR
)