nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
11,955 Commits 2 Branches 0 Tags
ad7f2afef9907ef6e52a17dd446b44d1dc774dbe
Commit Graph
759 Commits
Author SHA1 Message Date
nhmall 89c862b15a fix typo in typo fix 2015-04-22 21:44:04 -04:00
Alex Kompel cd72c7ec68 win32: fix broken dependency for ttystub.o 2015-04-22 18:12:14 -07:00
nhmall 3238303dc8 replace a couple of Makefile bits that shouldn't have been removed 
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
 2015-04-22 00:30:03 -04:00
nhmall aaca36a6d5 build both tty NetHack.exe and gui NetHackW.exe 
Changes to be committed:
	modified:   include/config.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/global.h
	modified:   include/ntconf.h
	modified:   include/wintty.h
	modified:   src/cmd.c
	modified:   src/files.c
	modified:   src/options.c
	modified:   sys/share/pcmain.c
	modified:   sys/share/pcsys.c
	modified:   sys/share/pcunix.c
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   sys/winnt/nttty.c
	new file:   sys/winnt/stubs.c
	modified:   sys/winnt/winnt.c
	modified:   util/makedefs.c
	modified:   win/tty/wintty.c

Adjust the code and the command line Makefile so that
you no longer have to choose whether to build the tty
version NetHack.exe, or the gui version NetHackW.exe.

Both will now be built in a single 'nmake install' pass.
 2015-04-22 00:07:46 -04:00
nhmall 0147b40ec7 Makefile bit 
NMAKE : fatal error U1073: don't know how to make 'tile.c'
 2015-04-19 13:51:47 -04:00
Dion Nicolaas 6457e8bf13 Change Makefile.gcc to bring it more in line with Makefile.msc 2015-04-18 13:31:30 +02:00
Dion Nicolaas 0c4573d82a fix tile2bmp build under mingw. Provide alternatives for Microsoft-specific macros. Be consistent about slashes in gcc Makefile. Don't include shlwapi.h for any compiler. 2015-04-16 22:36:06 +02:00
nhmall 1354215b97 Makefile bit 2015-04-14 20:45:18 -04:00
nhmall 0c769146ba gcc Makefile updates for recent file additions 2015-04-14 20:24:52 -04:00
nhmall 1e388fc1b9 update Makefile.gcc 
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
 2015-04-14 20:18:19 -04:00
nhmall 3d3ee78a0b Merge branch 'master' into win32-x64-working 
Conflicts:
	src/files.c
	src/potion.c
	sys/winnt/Makefile.msc

 Changes to be committed:
	modified:   .gitignore
	modified:   DEVEL/hooksdir/nhsub
	modified:   dat/.gitignore
	modified:   dat/opthelp
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/context.h
	modified:   include/decl.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   include/patchlevel.h
	modified:   src/apply.c
	modified:   src/attrib.c
	modified:   src/decl.c
	modified:   src/do.c
	modified:   src/do_name.c
	modified:   src/dothrow.c
	modified:   src/eat.c
	modified:   src/files.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mklev.c
	modified:   src/mondata.c
	modified:   src/monmove.c
	modified:   src/music.c
	modified:   src/options.c
	modified:   src/potion.c
	modified:   src/pray.c
	modified:   src/sit.c
	modified:   src/sp_lev.c
	modified:   src/uhitm.c
	modified:   sys/share/posixregex.c
	modified:   sys/winnt/Makefile.msc
	modified:   util/.gitignore
	modified:   win/win32/vs2010/NetHackW.vcxproj
 2015-04-14 18:23:48 -04:00
Derek S. Ray f244fd34f8 cppregex target accidentally commented out; fix 2015-04-13 20:57:01 -04:00
nhmall 6e62d56367 fix Makefile build in branch 2015-04-12 20:27:21 -04:00
nhmall 5dd00aca54 Makefile bit following merge 2015-04-12 12:16:59 -04:00
nhmall 83a7513c13 Merge branch 'master' into win32-x64-working 
Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c
 2015-04-12 10:35:00 -04:00
Derek S. Ray b4142b5894 Merge branch 'master' into win32-x64-working 
* master: (354 commits)
  Add missing protos
  a warning bout lc_error
  Add S_poisoncloud to Guidebooks
  ...

Conflicts:
	.gitattributes
	dat/.gitattributes
	doc/.gitattributes
	doc/Guidebook.mn
	include/config.h
	include/decl.h
	include/extern.h
	include/flag.h
	include/hack.h
	include/ntconf.h
	include/sys.h
	include/wceconf.h
	src/apply.c
	src/attrib.c
	src/bones.c
	src/botl.c
	src/dbridge.c
	src/dig.c
	src/do.c
	src/do_name.c
	src/dog.c
	src/dungeon.c
	src/eat.c
	src/end.c
	src/files.c
	src/fountain.c
	src/hack.c
	src/invent.c
	src/light.c
	src/makemon.c
	src/mhitu.c
	src/mklev.c
	src/mkmaze.c
	src/mkobj.c
	src/mkroom.c
	src/mon.c
	src/objnam.c
	src/options.c
	src/pager.c
	src/pickup.c
	src/potion.c
	src/pray.c
	src/questpgr.c
	src/read.c
	src/restore.c
	src/rnd.c
	src/role.c
	src/rumors.c
	src/save.c
	src/shk.c
	src/sit.c
	src/sp_lev.c
	src/sys.c
	src/teleport.c
	src/trap.c
	src/u_init.c
	src/uhitm.c
	src/wield.c
	src/worn.c
	src/zap.c
	sys/amiga/.gitattributes
	sys/mac/.gitattributes
	sys/msdos/.gitattributes
	sys/msdos/pctiles.c
	sys/msdos/vidvga.c
	sys/os2/.gitattributes
	sys/share/.gitattributes
	sys/share/pcmain.c
	sys/unix/.gitattributes
	sys/unix/hints/.gitattributes
	sys/unix/sysconf
	sys/unix/unixmain.c
	sys/vms/.gitattributes
	sys/wince/.gitattributes
	sys/wince/mhstatus.c
	sys/winnt/.gitattributes
	sys/winnt/Makefile.msc
	sys/winnt/nhsetup.bat
	util/lev_comp.l
	util/makedefs.c
	win/X11/winmenu.c
	win/X11/winstat.c
	win/gnome/gnstatus.c
	win/share/tilemap.c
	win/tty/termcap.c
	win/tty/topl.c
	win/tty/wintty.c
 2015-04-05 23:42:15 -04:00
nhmall c43e8f9d31 Merge branch 'master' into nhmall-booktribute 
Conflicts:
	include/context.h
 2015-04-02 19:19:50 -04:00
Pasi Kallinen 323b8b4038 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp 
Conflicts:
	src/trap.c
	sys/winnt/Makefile.msc
 2015-04-01 16:09:53 +03:00
Pasi Kallinen 3f885ef583 Remove EXPLORERS from winnt sysconf 
Stupidly added this to the winnt sysconf, when it should've
been *nix only.
 2015-04-01 08:29:12 +03:00
Pasi Kallinen ca80675d59 Allow admin to disable explore mode 
Some public servers want to disable explore mode, so
make it configurable in sysconf.
 2015-03-31 18:14:16 +03:00
keni 8ee2d5976e NHDT substitution version 2. 
Re-run nhgitset.pl to install.
"perldoc DEVEL/hooksdir/nhsub" for details.  General docs still to come.
Quick notes:
- "git nhsub" lets you apply substitutions to a file without involving any
  version control.
- When doing nhadd/nhcommit, the working directory WILL reflect the results
  of the substitutions.
Let's see what this breaks.
 2015-03-31 09:50:02 -04:00
nhmall 6ab783b05b cmdline Makefile updates 2015-03-29 21:00:50 -04:00
nhmall 0751842083 clean up cmdline Makefile for VS2010,VS2013,... 
VS2010 tested ok.
VS2013 tested ok.
VS2015 generated a _lot_ of linker warnings building NetHack, but it built.
 2015-03-29 20:28:38 -04:00
Pasi Kallinen 2d6f9686a7 Merge branch 'paxed-new_lev_comp' of https://rodney.nethack.org:20040/git/NHsource into paxed-new_lev_comp 
Conflicts:
	include/obj.h
	include/patchlevel.h
	src/topten.c
	src/trap.c
	sys/winnt/Makefile.msc
 2015-03-24 19:59:40 +02:00
nhmall 3fa52686d8 A couple of Makefile updates 
Include the tribute file.

Windows Makefile
Unix Makefile.top
 2015-03-22 22:06:13 -04:00
nhmall d792f7625d Merge branch 'master' into nhmall-booktribute 
Conflicts:
	sys/winnt/Makefile.msc
 2015-03-22 15:22:17 -04:00
nhmall b8515fb5fd throw in a windows sysconf skeleton 2015-03-21 15:54:30 -04:00
nhmall 734d118d39 a sys/winnt/Makefile.msc update 2015-03-21 15:50:03 -04:00
Pasi Kallinen 2649cb385c Merge branch 'master' into paxed-new_lev_comp 
Conflicts:
	.gitignore
	doc/fixes35.0
	include/obj.h
	include/patchlevel.h
	src/dig.c
	src/mklev.c
	src/rumors.c
	src/save.c
	src/topten.c
	src/trap.c
	sys/winnt/Makefile.msc
	util/makedefs.c
	win/win32/levstuff.mak
 2015-03-21 19:39:48 +02:00
nhmall a0d3224834 Merge branch 'master' into nhmall-booktribute 
Conflicts:
	sys/winnt/Makefile.msc
 2015-03-21 10:59:49 -04:00
nhmall d7ff451301 More book tribute integration 2015-03-21 10:33:59 -04:00
nhmall 66d642fad9 more mswin cmdline Makefile tweaks 2015-03-20 22:06:28 -04:00
nhmall 0a8d24d87d more updates to the bookstore tribute 2015-03-20 00:58:29 -04:00
nhmall d182920655 update cmdline Makefile 2015-03-18 23:00:46 -04:00
nhmall 5174eb157f One VS Makefile for Nethack that works with VS2010-VS2015 2015-03-17 18:47:21 +02:00
Sean Hunt 5fb3fea9c6 Remove experimental Unicode support. 
This reverts commit 7f0f43e6f9 and some related
subsequent commits.

This compiles, but I have not done extensive testing.

Conflicts:
	include/config.h
	include/decl.h
	include/extern.h
	include/global.h
	include/tradstdc.h
	include/wintty.h
	src/drawing.c
	src/files.c
	src/hacklib.c
	src/mapglyph.c
	src/options.c
	sys/winnt/nttty.c
	win/tty/getline.c
	win/tty/topl.c
	win/tty/wintty.c
 2015-03-17 18:46:45 +02:00
Sean Hunt cc7ab4a2da Make WIZARD unconditional. 2015-03-17 18:46:17 +02:00
keni 69356cc77d Another batch of manual header var additions 2015-03-17 18:45:43 +02:00
keni 28a53d5081 Fix lost mode bits. 2015-03-17 18:45:40 +02:00
keni 25cd007c48 Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-03-17 18:45:12 +02:00
keni 55a9ad84de Add .gitattribute files. 2015-03-17 18:44:59 +02:00
nhmall 00efbc5f8c cmd line Makefile should work on VS2010 and up 2015-03-14 12:29:27 -04:00
nhmall 285eea5bf2 one Makefile for all VS versions 2015-03-11 08:43:17 -04:00
nhmall 7c65f47dfd One VS Makefile for Nethack that works with VS2010-VS2015 2015-03-10 14:25:54 -04:00
Derek S. Ray 6ebb7db138 fix build order for nhdefkey, add to nhsetup 
also minor cosmetics; clean up two warnings in Release mode,
turn off multi-processor, and fix /Oi /Oi- discrepancy
 2015-02-28 22:56:03 -05:00
nhmall 5411039780 more work on getting nethack.exe to build along with nethackw.exe via VS 2015-02-28 11:44:08 -05:00
nhmall 796f6f85d0 VS 2013 build of NetHack.exe and also fix level file locking 2015-02-28 00:37:05 -05:00
Derek S. Ray b1a7bbbbdb pull in the recent unconditionals merge from master 2015-02-27 21:25:00 -05:00
Sean Hunt a3faa93403 Remove experimental Unicode support. 
This reverts commit 7f0f43e6f9 and some related
subsequent commits.

This compiles, but I have not done extensive testing.

Conflicts:
	include/config.h
	include/decl.h
	include/extern.h
	include/global.h
	include/tradstdc.h
	include/wintty.h
	src/drawing.c
	src/files.c
	src/hacklib.c
	src/mapglyph.c
	src/options.c
	sys/winnt/nttty.c
	win/tty/getline.c
	win/tty/topl.c
	win/tty/wintty.c
 2015-02-27 19:34:29 -05:00
Sean Hunt 4f59f5c6fd Make WIZARD unconditional. 2015-02-27 19:33:22 -05:00