Skip to content

Commit 6956739

Browse files
committed
remove autoconf section for README.md
1 parent 2a64212 commit 6956739

File tree

4 files changed

+34
-57
lines changed

4 files changed

+34
-57
lines changed

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,20 +241,20 @@ FSANITIZE+= -fsanitize=vptr
241241
#
242242
# For Apple clang and Homebrew gcc:
243243
#
244-
# CCWARN+= -Wall
245-
# CCWARN+= -pedantic
246-
# CCWARN+= -Werror
247-
# COPT:= -O0
244+
CCWARN+= -Wall
245+
CCWARN+= -pedantic
246+
CCWARN+= -Werror
247+
COPT:= -O0
248248
#
249249
# For Apple clang only:
250250
#
251-
# FSANITIZE+= -fsanitize=nullability-arg
252-
# FSANITIZE+= -fsanitize=nullability-assign
253-
# FSANITIZE+= -fsanitize=nullability-return
251+
FSANITIZE+= -fsanitize=nullability-arg
252+
FSANITIZE+= -fsanitize=nullability-assign
253+
FSANITIZE+= -fsanitize=nullability-return
254254
#
255-
# CFLAGS+= ${FSANITIZE} -fstack-protector-all
256-
# LDFLAGS+= ${FSANITIZE}
257-
# DEBUG:= -ggdb3
255+
CFLAGS+= ${FSANITIZE} -fstack-protector-all
256+
LDFLAGS+= ${FSANITIZE}
257+
DEBUG:= -ggdb3
258258
####
259259

260260
####

README.md

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -221,46 +221,6 @@ directly to this repo. Even so, we are greatful to the
221221
for making original code base available.
222222

223223

224-
## Configure and autoconf(1)
225-
226-
Some people prefer to not bother with the **Autoconf** facility and running `configure`.
227-
228-
> For more information on **Autoconf** see [Gnu Autoconf](https://www.gnu.org/software/autoconf/)
229-
230-
The upper level `Makefile` will, by default, attempt to use `src/configure`, you have `autoconf(1)` installed.
231-
The upper level `Makefile` will attempt to run `src/configure` with a reasonable set of options that
232-
have a change to work, assuming that [Gnu Autoconf](https://www.gnu.org/software/autoconf/) in installed.
233-
234-
Should the use of `src/configure` fail, you may wish to try our easy make rules:
235-
236-
* make easy-configure
237-
238-
This rule simply moves into place, some reasonable estimations of what `src/configure` tried to produce.
239-
240-
You may have to edit `src/config.h` and/or `src/Makefile` to suit your needs afterwards
241-
242-
* make easy-all
243-
244-
This rule invokes the all rule from the `src/Makefile.easy` makefile.
245-
246-
Now that you have both `src/config.h` and `src/Makefile`, use the
247-
`src/Makefile.easy` makefile to compile the code.
248-
249-
**IMPORTANT NOTE**: When bypassing [Gnu Autoconf](https://www.gnu.org/software/autoconf/), you no longer
250-
benefit from the **Autoconf** facility ability to configure the code for your system.
251-
Chances are, the above should work. However should something go wrong,
252-
you have have to edit `src/config.h` and/or `src/Makefile` or perhaps
253-
even modify the code. If do have to modify stuff, please consider sharing by opening up a
254-
[GitHub Pull Request](https://github.com/lcn2/rogue5.4/pulls).
255-
256-
* sudo make easy-install easy-clobber
257-
258-
Use the install rule in the `src/Makefile.easy` makefile to install `rogue(6)`,
259-
the `findpw(6)` and `scedit(6)` rouge tools, rogue documentation, and `rogue(6)` man page.
260-
261-
The addition of easy-clobber on the sudo line will "clean up" the source tree after installing.
262-
263-
264224
# Skip over the SPOILERS to the very bottom for Reporting Security Issues
265225

266226

save.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ save_file(FILE *savef)
140140
endwin();
141141
resetltchars();
142142
md_chmod(file_name, 0400);
143-
encwrite(version, strlen(version)+1, savef);
143+
encwrite(release, strlen(release)+1, savef);
144144
snprintf(buf, 80, "%d x %d\n", LINES, COLS);
145145
buf[80] = '\0'; /* paranoia */
146146
encwrite(buf,80,savef);
@@ -179,13 +179,14 @@ restore(const char *file)
179179
syml = is_symlink(file);
180180

181181
fflush(stdout);
182-
encread(buf, strlen(version) + 1, inf);
183-
if (strcmp(buf, version) != 0)
182+
encread(buf, strlen(release) + 1, inf);
183+
if (strcmp(buf, release) != 0)
184184
{
185185
printf("Sorry, saved game is out of date.\n");
186186
return FALSE;
187187
}
188188
encread(buf,80,inf);
189+
/* XXX - validate a proper scan - XXX */
189190
(void) sscanf(buf,"%d x %d\n", &lines, &cols);
190191

191192
initscr(); /* Start up cursor package */

vers.c

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,24 @@
11
/*
2-
* Version number. Whenever a new version number is desired, use sccs
3-
* to get vers.c. encstr is declared here to force it to be loaded
4-
* before the version number, and therefore not to be written in saved
5-
* games.
2+
* Release and Version number.
3+
*
4+
* release - just a rogue version number that is written to the rogue save file
5+
* version - source location and date
6+
*
7+
* Whenever a new version or release string is desired, modify the string below.
8+
*
9+
* The original authors claim:
10+
*
11+
* encstr is declared here to force it to be loaded before the version number,
12+
* and therefore not to be written in saved games.
13+
*
14+
* IMPORTANT NOTE: As of rogue 5.4.5, the release, NOT the version is written to the rogue save file.
15+
* The release is written to the rogue save file instead of the version.
16+
* So when you change the release string, you invalidate all old rogue save files.
17+
* You can now change the version without impacting rogue save files.
18+
*
19+
* NOTE: The encstr[] and statlist[] are used by encwrite() and encread().
20+
* You probably don't want to change either of them as doing so would almost
21+
* certainly invalidate existing rogue score files, and existing rogue save files.
622
*
723
* Rogue: Exploring the Dungeons of Doom
824
* Copyright (C) 1980-1983, 1985, 1999 Michael Toy, Ken Arnold and Glenn Wichman

0 commit comments

Comments
 (0)