Mercurial > hg > early-roguelike

changeset 225:4f6e056438eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge the GCC5 and build fix branches.
author John "Elwin" Edwards
date Wed, 02 Mar 2016 21:28:34 -0500
parents 4d0f53998e8a (diff) f54901b9c39b (current diff)
children b922f66acf4d
files
diffstat 20 files changed, 283 insertions(+), 6050 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/Makefile.in	Wed Mar 02 21:13:26 2016 -0500
+++ b/arogue5/Makefile.in	Wed Mar 02 21:28:34 2016 -0500
@@ -54,7 +54,7 @@
 CC    = gcc
 CPPFLAGS =@DEFS@
 CFLAGS=
-CRLIB = -lcurses
+CRLIB = @LIBS@
 RM    = rm -f
 TAR   = tar
 INSTALL=@INSTALL@
@@ -75,14 +75,17 @@
 	lint -hxbc $(CFILES) $(CRLIB) > linterrs
 
 install: $(PROGRAM)
-	-touch test
-	-if test ! -f $(DESTDIR)$(SCOREFILE) ; \
-	 then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
-	-if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
-	$(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
-	-if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
-	mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
-	-$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	touch test
+	if test ! -f $(DESTDIR)$(SCOREFILE) ; then \
+	    mkdir -p `dirname $(DESTDIR)$(SCOREFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
+	if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
+	    mkdir -p `dirname $(DESTDIR)$(LOGFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
+	    mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
+	mkdir -p $(DESTDIR)$(bindir)
+	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
 	-if test "x$(GROUPOWNER)" != "x" ; then \
 	    chgrp $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \
 	    chgrp $(GROUPOWNER) $(DESTDIR)$(LOGFILE) ; \
@@ -92,17 +95,17 @@
 	    chmod 0464 $(DESTDIR)$(SCOREFILE) ; \
 	    chmod 0464 $(DESTDIR)$(LOGFILE) ; \
 	    chmod 0775 $(DESTDIR)$(SAVEDIR) ; \
-         fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+        fi
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then mkdir -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
-	-$(RM) test
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
+	$(RM) test
 
 uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) -r $(DESTDIR)$(docdir)
-    
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) -r $(DESTDIR)$(docdir)
+
 reinstall: uninstall install
 
 clean:
--- a/arogue7/Makefile.in	Wed Mar 02 21:13:26 2016 -0500
+++ b/arogue7/Makefile.in	Wed Mar 02 21:28:34 2016 -0500
@@ -57,7 +57,7 @@
 MISC_C=	
 DOCSRC= aguide.mm
 #DOCS  = $(PROGRAM).doc $(PROGRAM).html
-DOCS  = arogue77.doc arogue77.html
+DOCS  = $(PROGRAM).doc arogue77.html
 MISC  =	Makefile $(MISC_C) LICENSE.TXT $(PROGRAM).sln $(PROGRAM).vcproj $(DOCS)\
         $(DOCSRC)
 
@@ -69,23 +69,41 @@
 LIBS =	@LIBS@
 RM    = rm -f
 INSTALL=@INSTALL@
+GROFF=@GROFF@
+NROFF=@NROFF@
+COLCRT=@COLCRT@
+TBL=@TBL@
 
 .SUFFIXES: .obj
 
 .c.obj:
 	$(CC) $(CFLAGS) /c $*.c
     
+all: $(PROGRAM) docs
+
 $(PROGRAM): $(HDRS) $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $@
     
-install: $(PROGRAM)
-	-touch test
-	-if test ! -f $(DESTDIR)$(SCOREFILE) ; \
-	 then $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
-	-if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
-	$(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
-	-if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
-	mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
+docs: $(DOCS)
+
+$(PROGRAM).doc: aguide.mm
+	if test "x$(GROFF)" != "x" ; then \
+	$(GROFF) -P-c -P-b -P-u -t -mm -Tascii aguide.mm > $(PROGRAM).doc ;\
+	elif test "x$(NROFF)" != "x" && test "x$(TBL)" != "x" && test "x$(COLCRT)" != "x" ; then \
+	$(TBL) aguide.mm | $(NROFF) -mm | $(COLCRT) - > $(PROGRAM).doc ;\
+	fi
+
+install: all
+	touch test
+	if test ! -f $(DESTDIR)$(SCOREFILE) ; then \
+	    mkdir -p `dirname $(DESTDIR)$(SCOREFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(SCOREFILE) ; fi
+	if test "x$(LOGFILE)" != "x" && test ! -f $(DESTDIR)$(LOGFILE) ; then \
+	    mkdir -p `dirname $(DESTDIR)$(LOGFILE)` ; \
+	    $(INSTALL) -m 0664 test $(DESTDIR)$(LOGFILE) ; fi
+	if test "x$(SAVEDIR)" != "x" && test ! -d $(DESTDIR)$(SAVEDIR) ; then \
+	    mkdir -p $(DESTDIR)$(SAVEDIR) ; fi
+	mkdir -p $(DESTDIR)$(bindir)
 	$(INSTALL) -m 0755 $(PROGRAM) $(DESTDIR)$(bindir)/$(PROGRAM)
 	-if test "x$(GROUPOWNER)" != "x" ; then \
 	    chgrp $(GROUPOWNER) $(DESTDIR)$(SCOREFILE) ; \
@@ -96,23 +114,23 @@
 	    chmod 0464 $(DESTDIR)$(SCOREFILE) ; \
 	    chmod 0464 $(DESTDIR)$(LOGFILE) ; \
 	    chmod 0775 $(DESTDIR)$(SAVEDIR) ; \
-         fi
-	-if test ! -d $(DESTDIR)$(docdir) ; \
+        fi
+	if test ! -d $(DESTDIR)$(docdir) ; \
 	    then mkdir -p $(DESTDIR)$(docdir) ; fi
-	-$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
-	-$(INSTALL) -m 0644 $(DOCS) $(DESTDIR)$(docdir)
-	-$(RM) test
+	$(INSTALL) -m 0644 LICENSE.TXT $(DESTDIR)$(docdir)/LICENSE.TXT
+	$(INSTALL) -m 0644 $(DOCS) $(DOCSRC) $(DESTDIR)$(docdir)
+	$(RM) test
 
-uninstall:	
-	-$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
-	-$(RM) -r $(DESTDIR)$(docdir)
-    
+uninstall:
+	$(RM) $(DESTDIR)$(bindir)/$(PROGRAM)
+	$(RM) -r $(DESTDIR)$(docdir)
+
 reinstall: uninstall install
 
 clean:
 	$(RM) $(OBJS1)
 	$(RM) $(OBJS2)
-	$(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe $(PROGRAM).lck
+	$(RM) core a.exe a.out a.exe.stackdump $(PROGRAM) $(PROGRAM).exe $(PROGRAM).lck $(PROGRAM).doc
 	$(RM) $(PROGRAM).tar $(PROGRAM).tar.gz $(PROGRAM).zip 
     
 dist.src:
--- a/arogue7/arogue77.doc	Wed Mar 02 21:13:26 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1122 +0,0 @@
-       
-
-
-
-
-
-                           The Dungeons of Doom
-
-                                Toolchest
-
-
-
-
-
-
-       1.  INTRODUCTION
-
-            Rogue  is  a  screen-oriented  fantasy  game set in the
-       ever-changing Dungeons of Doom.   The  game  comes  complete
-       with  monsters,  spells,  weapons, armor, potions, and other
-       magical items.  The dungeon's geography changes  with  every
-       game,   and   although   many  magical  items  have  certain
-       identifiable  properties,  such  as   turning   the   player
-       invisible,  the  physical manifestation of the magic changes
-       each game.  A red potion, for example, will cause  the  same
-       reaction throughout a given game, but it may be a completely
-       different potion in a new game.
-
-            Entering the dungeon with only a  little  food,  armor,
-       and  a  weapon,  the  player must develop a good strategy of
-       when to fight, when to run, and how to best use any  magical
-       items found in the dungeon.  To make things interesting, the
-       player  has  a  quest  to  return  one  of  several   unique
-       artifacts,  rumored  to  lie  deep  in the dungeon's bowels.
-       Returning with this artifact  brings  great  glory  and  the
-       title  of  Complete  Winner.   But  even  after  finding the
-       artifact, the player may wish to continue further  to  match
-       wits with an arch-devil, demon prince, or even a deity found
-       far down in the dungeon.  Defeating  such  a  creature  will
-       gain  the  player  many  experience  points,  the  basis for
-       scoring in Rogue.
-
-            It is very difficult to return  from  the  Dungeons  of
-       Doom.   Few  people  ever  make  it  out alive.  Should this
-       unlikely event occur,  the  player  would  be  proclaimed  a
-       complete  winner  and  handsomely  rewarded  for  any  booty
-       removed from the dungeon.
-
-
-       2.  CHARACTER CLASSES
-
-            Before placing the player  in  the  dungeon,  the  game
-       requests  the  player  to select what type of character they
-       would like to be:  a fighter, a  magic  user,  a  cleric,  a
-       druid, a thief, a paladin, a ranger, a monk, or an assassin.
-
-       2.1  The Fighter
-
-            A fighter is very strong and will have a high  strength
-       rating.   This  great strength gives a fighter the best odds
-       of winning a battle with  a  monster.   At  high  experience
-
-
-
-
-