First pass at a hints-based build system to augment (not replace) the existing

build system.

Anyone who wants to do a build from sys/unix and doesn't want to figure this
out just needs to do:
	sh setup.sh hints/unix
instead of:
	sh setup.sh
and then continue on as usual.

New files:
sys/unix/NewInstall.unx - the new directions
sys/unix/hints/* - the hints files.  There will be more later.
sys/unix/mkmkfile.sh - helper for setup.sh

Summary of changes:
see NewInstall.unx for info on the new build system
introduction of various preprocessor symbols to turn options off that
 are defaulted on historically
comment out nethackrc (and similar) entries that still use the old symbol
 syntax.
commenting out of Makefile.* lines that now come from hints/unix
GAMEDIR is replaced with HACKDIR so the Makefiles and the C source agree.
  Note that I have NOT changed the docs and/or Makefiles for be, msdos, os2,
  vms, or winnt.  If port maintainers don't then I will, but I can't test
  those ports.
nethack.sh now handles the font path automatically
This commit is contained in:
keni
2007-12-13 20:17:11 +00:00
parent 6e41d8e973
commit 59e64a1d40
17 changed files with 251 additions and 111 deletions

View File

@@ -87,19 +87,17 @@ and then use the symbol mappings found in nethack.rc. The fonts are found
in nh10.bdf and ibm.bdf. You first need to convert the bdf files to whatever
form your X11 server recognizes (usually using a command called bdftosnf
for R4 servers or bdftopcf for R5 servers). Then run mkfontdir on the
directory containing your font files (you might want to copy them to GAMEDIR,
directory containing your font files (you might want to copy them to HACKDIR,
from the top Makefile, after you've done "make install"). If these commands
aren't familiar, talk to your local X11 guru and read the man pages.
Finally, add that directory to your font search path (e.g. xset fp+ GAMEDIR,
setting GAMEDIR to the value of GAMEDIR in the top Makefile). Alternatively,
nethack.sh automatically adds HACKDIR to your font search path. If
you (assuming you are a system administrator) can install the fonts in your
standard X11 font directory. If you do not install the fonts in the standard
X11 font directory, all persons playing nethack must add that "xset fp+"
standard X11 font directory the relevent lines in nethack.sh can be removed.
Alternatively, all persons playing nethack must add that "xset fp+"
command to their .xinitrc file, or whatever file they execute when starting
X11. Adding the "xset" command to the nethack.sh is also an alternative,
though it may clutter your X11 font search path after playing several games,
so this method is not recommended. See the note below for the alternative
installation procedure for Sun's OpenWindows.
X11. See the note below for the alternative installation procedure
for Sun's OpenWindows.
If your X11 include files and libraries are not installed in a standard

View File

@@ -13,29 +13,32 @@ OPTIONS=verbose,news,fruit:pineapple
OPTIONS=dogname:Dhairrhuwyth
OPTIONS=catname:Ghisteslwchlohm
#
# The graphics symbols mappings below are for NetHack 3.4. NetHack 3.5
# uses a new scheme, but this file has not been updated.
#
# There are 17 object symbols and various graphics symbols.
# The descriptions of these symbols can be found in dat/opthelp.
#
#
# Font: nh10 (10x20)
#
OBJECTS= 180 183 188 192 181 184 182 189 190 196 \
191 194 193 187 185 186 195
#OBJECTS= 180 183 188 192 181 184 182 189 190 196 \
# 191 194 193 187 185 186 195
#
DUNGEON= 032 025 018 013 012 014 011 015 023 024 \
022 021 128 129 130 131 132 035 035 133 \
134 135 136 137 145 146 144 124 143 142 \
141 140 149 150 031 031 147 148 031 161 \
140
#DUNGEON= 032 025 018 013 012 014 011 015 023 024 \
# 022 021 128 129 130 131 132 035 035 133 \
# 134 135 136 137 145 146 144 124 143 142 \
# 141 140 149 150 031 031 147 148 031 161 \
# 140
#
TRAPS= 138 138 138 138 138 138 138 138 138 138 \
138 138 138 138 138 139 138 138 138 138 \
138 138
#TRAPS= 138 138 138 138 138 138 138 138 138 138 \
# 138 138 138 138 138 139 138 138 138 138 \
# 138 138
#
EFFECTS= 151 152 153 154 155 156 157 158 \
159 160 161 162 \
163 164 165 166 167 168 169 170 \
171 172 173 174 175 176 177 178 179
#EFFECTS= 151 152 153 154 155 156 157 158 \
# 159 160 161 162 \
# 163 164 165 166 167 168 169 170 \
# 171 172 173 174 175 176 177 178 179
#
#
# Font: ibm (8x14)

View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)termcap.c 3.5 2005/11/19 */
/* SCCS Id: @(#)termcap.c 3.5 2007/12/12 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -803,7 +803,7 @@ cl_eos() /* free after Robert Viduya */
#include <curses.h>
#if !defined(LINUX) && !defined(__FreeBSD__)
#if !defined(LINUX) && !defined(__FreeBSD__) && !defined(NOTPARMDECL)
extern char *tparm();
#endif