Commit Graph

241 Commits

Author SHA1 Message Date
PatR
2e9a2002c4 NH_HEAPLOG vs tile utilities
I just tried to build with MONITOR_HEAP defined in unixconf.h plus
WANT_WIN_X11=1 for make.  tile2x11 wouldn't link.  It doesn't use
alloc() and free(), but it does link with drawing.o, and drawing.o
has calls to free(), so MONITOR_HEAP makes it need nhfree() from
alloc.o.

All the miscellaneous tile utilities seem to link with drawing.o, so
they all need alloc.o too, and that drags in util/panic.o as well.
I've only changed it for Unix where I can actually test the change
but other platforms probably should do this too.  Or we need to redo
drawing.c so that the small subset of stuff utilities want is
separate from the code the core uses for that same stuff.
2016-02-01 17:30:09 -08:00
Pasi Kallinen
fe01018d90 Enable TIMED_DELAY for linux hints files
runmode is completely useless in TTY without this
2016-01-10 15:09:03 +02:00
Haoyang Wang
69e1113aa9 fix #H4082: create games group from package postinstall script 2015-12-23 04:53:28 -08:00
Haoyang Wang
69cfa4b134 set permissions of symbols file in package postinstall script 2015-12-17 06:53:14 -08:00
Haoyang Wang
ad138be8fb use 'macosx.sh editsysconf' to install sysconf 2015-12-17 06:06:20 -08:00
Haoyang Wang
894c751043 added editsysconf command in macosx.sh 2015-12-17 06:06:20 -08:00
Haoyang Wang
bf7a259646 turn off use_darkgray in sysconf 2015-12-17 06:06:20 -08:00
Pasi Kallinen
f4a6ccf3f0 Update sysconf MAXPLAYERS docs a bit 2015-12-10 10:14:24 +02:00
Pasi Kallinen
43550bee53 Allow unlimited number of players
This is important for public servers.  Setting the MAXPLAYERS
sysconf value to 0 (or commenting it out) constructs the lock
files with the player UID and player name, so each player may
have one game at a time.
2015-12-09 22:27:26 +02:00
PatR
bb72860ce2 fix #H4011 - sys/unix/Makefile.top
Some commented make variables for X11 misspelled 'pilemark.xbm' with
bad '.xbm' suffix.

'symbols' was handled strangely, but it still should have been working
during playground installation.  This removes the strangeness but I have
no idea whether it solves #H4015 ('unable to access "symbols" file' for
the Mac OSX binary).
2015-12-08 16:39:39 -08:00
PatR
544315eaac add missing sys/vms/sysconf
SYSCF is enabled by default, but nethack won't run without the required
sysconf file.  sys/vms/install.com expects to find a template one in
sys/vms/sysconf so create that.

Since the tarball will need repackaging, fix a comment typo (dyslexic
spelling of "nymph") in sys/unix/sysconf.  Also, move DEBUGFILES to the
bottom so that more useful entries move up.  And expand the comment for
the PANICTRACE options.
2015-12-06 16:47:20 -08:00
PatR
996c0a3741 unix/Makefile.utl: tweak lex/yacc postprocessing 2015-12-05 23:26:41 -08:00
PatR
fc92770cf7 lexing updates (sys/unix/Makefile.utl)
Change the 'make' rules for *_lex.c, *_yacc.c, and *_comp.h to put
the end files names into whatever #line directives that refer to
the generated names (lex.yy.c, y.tab.c, y.tab.h).  This should not
produce any change in behavior during compilation except to provide
more accurate specifications of where any warnings or errors occur.

Add a 'make dist' target that copies generated scanner and parser
files to sys/share.  (As mentioned in the previous patch, I haven't
committed any of those since I have different versions of flex and
also of bison.)
2015-11-28 03:46:33 -08:00
PatR
493027cbc8 sysconf update
Add missing 'sysconf' to sys/unix/ and sys/winnt/ sections of Files.

Update sys/unix/sysconf; I started out just to remove the duplicate
DEBUGFILES entry but ended up expanding several of the comments too.

Also, fix a typo in the vms build/install instructions.
2015-11-18 18:07:35 -08:00
Haoyang Wang
70aa7fe818 Merge branch 'master' into mac-build-tty-pkg 2015-11-18 13:23:35 -08:00
PatR
5e5a78fdb2 X11 pilemark.xbm
Update the unix Makefiles and the older OSX hints files to handle the
pile marker tile overlay.  I didn't touch hints/macosx10.10 and .11
since I think there's still a merge for them pending.

A couple of formatting tweaks for bemain.c are included, for no
compelling reason.  What are the odds that anyone will every build
that again?
2015-11-18 03:04:35 -08:00
PatR
1fb9de1375 unix/Makefile.utl typo
Confusing build failure, explained by a typo in sys/unix/Makefile.utl.
dgn_lex.o didn't get rebuilt after modifying unixconf.h to take out
the #define MONITOR_HEAP I had in place, resulting in link failure for
dgn_comp because the old object file was referencing 'nhalloc' rather
than 'alloc'.  dgn_lex.o accidentally didn't care about modifications
to config.h and the other headers that pulls in, such as unixconf.h.

This typo was already present when the last cvs repository was
initialized nearly 14 years ago.
2015-11-17 03:09:20 -08:00
PatR
ef2a6e6f1b make depend
dungeon.o depending on lev.h is the only change found by 'make depend'.
(I'm a bit suspicious about that.)

I haven't attempted to reconcile the vms Makefiles with the Unix ones,
just put in this one new dependency.  I know vms/Makefile.src lacks
handling for sys/share/*regex.c and vms/Makefile.top and install.com
both lack handling for 'sysconf'.
2015-11-11 23:46:19 -08:00
Haoyang Wang
2ebcd1bb42 When build_tty_pkg, include the sysconf with mac-specific changes 2015-11-09 13:59:14 -08:00
Haoyang Wang
72afe346cc use pstopdf to generate Guidebook.pdf 2015-11-09 00:25:34 -08:00
Haoyang Wang
8497f0f92d pilemark.xbm 2015-11-09 00:22:33 -08:00
Haoyang Wang
ff599b5b1b X11 include and lib 2015-11-09 00:22:33 -08:00
Haoyang Wang
d302ba2290 also touch logfile 2015-11-09 00:22:33 -08:00
Haoyang Wang
95f6c2bf67 remove macosx10.11 because macosx10.10 works on both .10 and .11 2015-11-09 00:22:33 -08:00
Haoyang Wang
1f47522732 default to WANT_SHARE_INSTALL off 2015-11-09 00:22:33 -08:00
Haoyang Wang
6cee2693b8 add postinstall script to set the file permissions 2015-11-09 00:22:33 -08:00
Haoyang Wang
2894f1f873 fix make install; fix the package directory tree 2015-11-09 00:22:33 -08:00
Haoyang Wang
93d2d28f78 PackageManager is no longer available. Use productbuild instead. 2015-11-09 00:22:33 -08:00
Pasi Kallinen
aa1646a75d Update the linux README 2015-11-06 15:35:38 +02:00
Pasi Kallinen
ec58bfaa22 Pass LFLAGS from hints file to util Makefile 2015-10-27 18:13:35 +02:00
keni
c574b566be First bits of a hints file for 10.11. Still needs (at minimum) new packaging code. 2015-10-23 13:47:38 -04:00
Pasi Kallinen
50eb826c0f Add a chroot install hints file for linux
This makes installing NetHack on a public server much easier.
Required some minor changes to the unix top-level Makefile, and
the other hints files; Makefile variable HACKDIR may not be a
full path anymore, use INSTDIR instead.
2015-08-13 16:30:57 +03:00
Sean Hunt
ff823095ee Revert "Add tombstone tribute to S.T.P. for 3.6.0"
This reverts commit 64dfb4fcc8.
2015-08-03 12:56:32 -04:00
Sean Hunt
9f0c9b4a0b Revert "Properly define NH360_DEDICATION in Makefiles"
This reverts commit 3db39ca221.
2015-08-03 12:56:26 -04:00
Pasi Kallinen
3db39ca221 Properly define NH360_DEDICATION in Makefiles 2015-07-31 15:51:01 +03:00
Sean Hunt
64dfb4fcc8 Add tombstone tribute to S.T.P. for 3.6.0
I've added build files for unices, but other platforms will need to define
NH360_DEDICATION on their own.
2015-07-19 12:42:23 -04:00
PatR
1547e676f3 finish implementing pmatchregex
I started out cleaning up a bit of lint in the recent run-time options
handling and discovered that pmatchregex wasn't finished.  Finish it and
also deal with the version lint.  Argument declarations for function
definitions in pmatchregex.c have been switched to K&R style.  (The ones
in posixregex.c have been left in ANSI style.)

There wasn't any build rule for pmatchregex.o; now there is (for Unix).
posixregex.o is still the default.

There isn't any build rule for cppregex.o (again, for Unix); the change
to cppregex.cpp is untested.
2015-06-16 02:29:22 -07:00
nhmall
cff16290af Merge branch 'macosx-build' 2015-06-10 18:57:23 -04:00
Pasi Kallinen
b4cc349a46 X11: Hilight piles of objects 2015-06-09 19:59:38 +03:00
Pasi Kallinen
9070d129de Use MAKE variable instead of hardcoding make 2015-06-06 20:25:32 +03:00
Haoyang Wang
d72e0d0fde hint file for macosx10.10 2015-06-05 15:57:56 -07:00
Haoyang Wang
ca27c0b543 add /usr/X11R6/include to the include paths 2015-06-05 15:43:18 -07:00
Pasi Kallinen
04783f1c8a Remove extraneous line from linux-X11 hints file 2015-06-05 20:42:00 +03:00
Sean Hunt
1c081b1647 Remove stale version control lines. 2015-05-25 09:21:31 +09:00
Sean Hunt
97d6fade74 Reformat all C files.
I'll push a formatting guide at some point. There may still be
outstanding changes, but please feel free to resolve those as you arrive
a them.

To the best of my knowledge, there is no changes to the actual code
content, but the formatter does have the occasional bug. If you run into
an issue, please fix it!
2015-05-09 13:43:16 -04:00
nhmall
20069798d4 Merge branch 'master' into win32-x64-working 2015-05-07 04:52:30 -04:00
Sean Hunt
8c0c587fd7 Restore lost executable bits. 2015-05-06 23:23:48 -04:00
karnov
2a907f894e Version number increment 2015-05-06 22:04:27 -04:00
PatR
39fcd6459c couple bits omitted from lint.h patch
* list lint.h in Files
* add dependency to win/X11/dialogs.o since dialogs.c includes lint.h
  directly rather than via hack.h
2015-05-06 17:33:48 -07:00
nhmall
1ef94c890f Merge branch 'master' into win32-x64-working
Conflicts:
	include/hack.h
	win/X11/winmenu.c
	win/X11/winstat.c
2015-05-06 19:53:26 -04:00