fix Makefile and README.md for 2020/tsoj

This commit is contained in:
Landon Curt Noll committed 2023-03-11 00:26:24 -08:00
1 parent a90ad8d5b9
commit f641322d58
2 files changed
+140 -395

No files matched your search

+120 -383
View File
@@ -1,14 +1,41 @@
#!/usr/bin/env make #!/usr/bin/env make
# #
# 2020 makefile # IOCCC 2020 winning entry - tsoj
################################################################################
# #
# This work by Landon Curt Noll, Simon Cooper, and Leonid A. Broukhis # Regarding individual entries:
# is licensed under: #
# IOCCC winning entry code may not work on your system. Even with standards,
# conditions and build environments change, especially when it comes to more
# extreme code such you might find in an IOCCC winner. Moreover, what was
# allowed and liked in one IOCCC contest may no longer be liked/allowed in
# later IOCCC years.
#
# Corrections on winning author and fixing typos in remarks are VERY WELCOME.
#
# GitHub pull requests are welcome:
#
# If you have a patch that might make running an entry work in modern Unix-like
# environments, please create a GitHub pull request for the IOCCC judges to
# consider.
#
# Suggestions and corrections regarding Makefiles, winning author information,
# fixing typos in remarks, and code patches are welcome via opening a GitHub
# issue or better yet, by creating a GitHub pull request for the IOCCC judges
# to consider. To form a GitHub issue or GitHub pull, please visit:
#
# https://github.com/ioccc-src/winner
#
################################################################################
# This work by Landon Curt Noll and Leonid A. Broukhis is licensed under:
# #
# Creative Commons Attribution-ShareAlike 3.0 Unported License. # Creative Commons Attribution-ShareAlike 3.0 Unported License.
# #
# See: http://creativecommons.org/licenses/by-sa/3.0/ # See: http://creativecommons.org/licenses/by-sa/3.0/
############################# #############################
# shell used by this Makefile # shell used by this Makefile
############################# #############################
@@ -19,264 +46,7 @@ SHELL= bash
# common tool locations # common tool locations
####################### #######################
# #
A2P= a2p include ../../var.mk
AR= ar
ASA= asa
AT= at
ATQ= atq
ATRM= atrm
AWK= awk
BANNER= banner
BASE64= base64
BASENAME= basename
BATCH= batch
BC= bc
BINHEX= binhex
BISON= bison
BUNZIP2= bunzip2
BZCAT= bzcat
BZCMP= bzcmp
BZDIFF= bzdiff
BZEGREP= bzegrep
BZFGREP= bzfgrep
BZGREP= bzgrep
BZIP2= bzip2
BZLESS= bzless
BZMORE= bzmore
C2PH= c2ph
C89= c89
C99= c99
CAL= cal
CALC= calc
CAT= cat
CD= cd
CHFLAGS= chflags
CHGRP= chgrp
CHMOD= chmod
CKSUM= cksum
CLANG= clang
CLANG_PLUSPLUS= clang++
CLEAR= clear
CMP= cmp
COL= col
COLLDEF= colldef
COLRM= colrm
COLUMN= column
COMPRESS= compress
CP= cp
CPIO= cpio
CPP= cpp
CRC32= crc32
CSH= csh
CSPLIT= csplit
CURL= curl
CUT= cut
C_PLUSPLUS= c++
C_PLUSPLUS_FILT= c++filt
DATE= date
DC= dc
DD= dd
DF= df
DIFF3= diff3
DIFF= diff
DIG= dig
DIRNAME= dirname
ED= ed
EGREP= egrep
ENV= env
EQN= eqn
ETAGS= etags
EXPECT= expect
EXPR= expr
FALSE= false
FGREP= fgrep
FILE= file
FIND2PERL= find2perl
FIND= find
FLEX= flex
FLEX_PLUSPLUS= flex++
FMT= fmt
FOLD= fold
FS_USAGE= fs_usage
FUNZIP= funzip
FUSER= fuser
GCC= gcc
GDIFFMK= gdiffmk
GENCAT= gencat
GENSTRINGS= genstrings
GETOPT= getopt
GETOPTS= getopts
GINDENT= gindent
GNUMAKE= gnumake
GREP= grep
GROFF= groff
GROFFER= groffer
GROG= grog
GROPS= grops
GROTTY= grotty
GUNZIP= gunzip
GVIM= gvim
GZCAT= gzcat
GZEXE= gzexe
GZIP_PROG= gzip
G_PLUSPLUS= g++
H2PH= h2ph
H2XS= h2xs
HASH= hash
HEAD= head
HOSTNAME_PROG= hostname
ICONV= iconv
ID= id
INDENT= indent
INFO= info
JOT= jot
KILL= kill
KSH= ksh
LAST= last
LD= ld
LESSECHO= lessecho
LEX= len
LINK= link
LN= ln
LS= ls
M4= m4
MAKE= make
MAN= man
MKDIR= mkdir
MKFIFO= mkfifo
MKTEMP= mktemp
MV= mv
NANO= nano
NASM= nasm
NEQN= neqn
NICE= nice
NL= nl
NM= nm
NOHUP= nohup
NROFF= nroff
NSLOOKUP= nslookup
OD= od
OPENSSL= openssl
PASTE= paste
PATCH= patch
PATHCHK= pathchk
PAX= pax
PERL= perl
PICO= pico
PR= pr
PRINTENV= printenv
PS= ps
PTAR= ptar
PTARDIFF= ptardiff
PTARGREP= ptargrep
PWD= pwd
PYDOC= pydoc
PYTHON= python
PYTHONW= pythonw
READLINK= readlink
RENICE= renice
RESET= reset
REV= rev
RI= ri
RM= rm
RMDIR= rmdir
RSYNC= rsync
RUBY= ruby
RVIM= rvim
SAY= say
SCP= scp
SCREEN= screen
SCRIPT= script
SDIFF= sdiff
SED= sed
SEQ= seq
SFTP= sftp
SH= sh
SHA1= sha1
SHA= sha
SHAR= shar
SHASUM5_18= shasum5.18
SHASUM= shasum
SIZE= size
SLEEP= sleep
SORT= sort
SSH= ssh
STAT= stat
STRIP= strip
STTY= stty
SUM= sum
SYNC= sync
TABS= tabs
TAIL= tail
TAR= tar
TEE= tee
TEST= test
TFTP= tftp
TIDY= tidy
TIME= time
TOP= top
TOUCH= touch
TPUT= tout
TPUT= tput
TR= tr
TROFF= troff
TRUE= true
TSET= tset
TSORT= tsort
UL= ul
UNAME= uname
UNCOMPRESS= uncompress
UNEXPAND= unexpand
UNIFDEF= unifdef
UNIFDEFALL= unifdefall
UNIQ= uniq
UNITS= units
UNLINK= unlink
UNZIP= unzip
UNZIPSFX= unzipsfx
UPTIME= uptime
UUDECODE= uudecode
UUENCODE= uuencode
UUIDGEN= uuidgen
VI= vi
VIEW= view
VIM= vim
VIMDIFF= vimdiff
W= w
WAIT4PATH= wait4path
WAIT= wait
WC= wc
WHAT= what
WHATIS= whatis
WHICH= which
WHO= who
WHOAMI= whoami
WHOIS= whois
WRTIE= write
XAR= xar
XARGS= xargs
XATTR= xattr
XXD= xxd
YACC= yacc
YES= yes
ZCAT= zcat
ZCMP= zcmp
ZDIFF= zdiff
ZEGREP= zegrep
ZFGREP= zfgrep
ZFORCE= zforce
ZGREP= zgrep
ZIP= zip
ZIPCLOAK= zipcloak
ZIPGREP= zipgrep
ZIPINFO= zipinfo
ZIPNOTE= zipnote
ZIPSPLIT= zipsplit
ZLESS= zless
ZMORE= zmore
ZNEW= znew
ZPRINT= zprint
ZSH= zsh
# Set X11_LIBDIR to the directory where the X11 library resides # Set X11_LIBDIR to the directory where the X11 library resides
# #
@@ -290,68 +60,25 @@ X11_LIBDIR= /opt/X11/lib
#X11_INCDIR= /usr/X11/include #X11_INCDIR= /usr/X11/include
X11_INCDIR= /opt/X11/include X11_INCDIR= /opt/X11/include
# CWARN - Silence warnings that ${CWARN} would normally complain about # Common C compiler warnings to silence
# CSILENCE -Compiler warnings
#
ifeq ($(CC),clang)
# clang CSILENCE and CWARN
# #
#CSILENCE= #CSILENCE=
#CSILENCE= -Wno-implicit-int CSILENCE= -Wno-empty-body -Wno-missing-field-initializers
CSILENCE= -Wno-comma -Wno-empty-body -Wno-float-conversion -Wno-implicit-float-conversion \
-Wno-missing-field-initializers -Wno-missing-prototypes -Wno-shadow -Wno-shorten-64-to-32 \
-Wno-sign-conversion -Wno-vla -Wno-conversion -Wno-unknown-warning-option
#
#CWARN= $CSILENCE}
#CWARN= -Wall $CSILENCE}
#CWARN= -Wall -Wextra $CSILENCE}
#CWARN= -Wall -Wextra -pedantic ${CSILENCE}
#CWARN= -Wall -Wextra -Weverything $CSILENCE}
CWARN= -Wall -Wextra -Weverything -pedantic ${CSILENCE}
else # Common C compiler warning flags
ifeq ($(CC),gcc)
# gcc CSILENCE and CWARN
# #
#CSILENCE= #CWARN= ${CSILENCE}
#CSILENCE= -Wno-implicit-int #CWARN= -Wall ${CSILENCE}
CSILENCE= -Wno-empty-body -Wno-missing-field-initializers -Wno-misleading-indentation \ #CWARN= -Wall -Wextra ${CSILENCE}
-Wno-unknown-warning-option
#
#CWARN= $CSILENCE}
#CWARN= -Wall $CSILENCE}
#CWARN= -Wall -Wextra $CSILENCE}
CWARN= -Wall -Wextra -pedantic ${CSILENCE} CWARN= -Wall -Wextra -pedantic ${CSILENCE}
else # Compiler standard
# default CSILENCE and WARN
#
#CSILENCE=
#CSILENCE= -Wno-implicit-int
CSILENCE= -Wno-empty-body -Wno-missing-field-initializers \
-Wno-misleading-indentation -Wno-unknown-warning-option
#
#CWARN= $CSILENCE}
#CWARN= -Wall $CSILENCE}
#CWARN= -Wall -Wextra $CSILENCE}
CWARN= -Wall -Wextra -pedantic ${CSILENCE}
#CWARN= -Wall -Wextra -Weverything $CSILENCE}
#CWARN= -Wall -Wextra -Weverything -pedantic ${CSILENCE}
endif
endif
# compiler standard
# #
#CSTD= #CSTD=
#CSTD= -ansi #CSTD= -ansi
#CSTD= -std=c11 CSTD= -std=gnu17
CSTD= -std=c99
# compiler bit architecture # Compiler bit architecture
# #
# Some entries require 32-bitness: # Some entries require 32-bitness:
# ARCH= -m32 # ARCH= -m32
@@ -363,20 +90,21 @@ CSTD= -std=c99
# #
ARCH= ARCH=
# defines that are needed to compile # Defines that are needed to compile
# #
CDEFINE= CDEFINE=
#CDEFINE= -DIOCCC #CDEFINE= -DIOCCC
# include files that are needed to compile # Include files that are needed to compile
# #
CINCLUDE= CINCLUDE=
#CINCLUDE= -include stdlib.h #CINCLUDE= -include stdlib.h
#CINCLUDE= -include stdio.h #CINCLUDE= -include stdio.h
#CINCLUDE= -include stdlib.h -include stdio.h #CINCLUDE= -include stdlib.h -include stdio.h
#CINCLUDE= -I ${X11_INCDIR} #CINCLUDE= -I ${X11_INCDIR}
#CINCLUDE= `${SDL2_CONFIG} --cflags`
# optimization # Optimization
# #
# Most compiles will safely use -O2. Some can use only -O1 or -O. # Most compiles will safely use -O2. Some can use only -O1 or -O.
# A few compilers have broken optimizers or this entry make break # A few compilers have broken optimizers or this entry make break
@@ -389,38 +117,57 @@ CINCLUDE=
#OPT= -O2 #OPT= -O2
OPT= -O3 OPT= -O3
# default flags for ANSI C compilation # Default flags for ANSI C compilation
# #
CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT}
# Libraries needed to build # Libraries needed to build
# #
LIBS= LIBS=
#LIBS= -L ${X11_LIBDIR} #LIBS= -lm
#LIBS= -L ${X11_LIBDIR} -lX11
#LIBS= `${SDL2_CONFIG} --libs`
# ANSI compiler # C compiler to use
#
# Set CC to the name of your ANSI compiler.
#
# Some entries seem to need gcc. If you have gcc, set
# both CC and MAY_NEED_GCC to gcc.
#
# If you do not have gcc, set CC to the name of your ANSI compiler, and
# set MAY_NEED_GCC to either ${CC} (and hope for the best) or to just :
# to disable such programs.
# #
CC= cc CC= cc
#CC= clang #CC=clang
MAY_NEED_GCC= gcc #CC=gcc
# Compiler add-ons or replacements for clang only
#
ifeq ($(CC),clang)
#
CSILENCE+= -Wno-comma -Wno-float-conversion -Wno-implicit-float-conversion \
-Wno-missing-prototypes -Wno-poison-system-directories -Wno-shadow \
-Wno-shorten-64-to-32 -Wno-sign-conversion -Wno-strict-prototypes \
-Wno-vla
#
CWARN+= -Weverything
#
endif
# Specific add-ons or replacements for gcc only
#
ifeq ($(CC),gcc)
#
#CSILENCE+=
#
#CWARN+=
#
endif
############################## ##############################
# Special flags for this entry # Special flags for this entry
############################## ##############################
# #
OBJ= prog.o ENTRY= tsoj
PROG= prog
#
OBJ= ${PROG}.o
DATA= DATA=
TARGET= prog TARGET= ${PROG}
# #
ALT_OBJ= ALT_OBJ=
ALT_TARGET= ALT_TARGET=
@@ -430,15 +177,19 @@ ALT_TARGET=
# build the entry # build the entry
################# #################
# #
all: ${TARGET} ${DATA} all: data ${TARGET}
@${TRUE} @${TRUE}
prog: prog.c .PHONY: all alt data everything clean clobber install \
love haste waste maker easter_egg sandwich \
supernova deep_magic magic charon pluto
${PROG}: ${PROG}.c
${CC} ${CFLAGS} $< -o $@ ${LIBS} ${CC} ${CFLAGS} $< -o $@ ${LIBS}
# alternative executable # alternative executable
# #
alt: ${ALT_TARGET} alt: data ${ALT_TARGET}
@${TRUE} @${TRUE}
# data files # data files
@@ -446,13 +197,15 @@ alt: ${ALT_TARGET}
data: ${DATA} data: ${DATA}
@${TRUE} @${TRUE}
# both all and alt
#
everything: all alt
############### ###############
# utility rules # utility rules
############### ###############
# #
everything: all alt
clean: clean:
${RM} -f ${OBJ} ${ALT_OBJ} ${RM} -f ${OBJ} ${ALT_OBJ}
@-if [ -f indent.c ]; then \ @-if [ -f indent.c ]; then \
@@ -467,24 +220,13 @@ clobber: clean
echo 'ate sandwich'; \ echo 'ate sandwich'; \
fi fi
nuke: clobber
@${TRUE}
dist_clean: nuke
@${TRUE}
install: install:
@echo "Surely you are performing, Dr. Science!" @echo "Dr. Spock says that is not logical!"
@${TRUE} @${TRUE}
# backwards compatibility # you may be able to misunderstand the source by reading indent.c
# #
build: all indent.c: ${PROG}.c
@${TRUE}
# you may be able to mis-understand the source by reading indent.c
#
indent.c: prog.c
@if which "${GINDENT}" >/dev/null 2>&1; then \ @if which "${GINDENT}" >/dev/null 2>&1; then \
echo ${RM} -f $@; \ echo ${RM} -f $@; \
${RM} -f $@; \ ${RM} -f $@; \
@@ -496,7 +238,7 @@ indent.c: prog.c
echo "${INDENT} < $< > $@"; \ echo "${INDENT} < $< > $@"; \
${INDENT} < $< > $@; \ ${INDENT} < $< > $@; \
else \ else \
echo "no intent prog found, ident $< yourself, sorry"; \ echo "no intent tool found, ident $< yourself, sorry"; \
echo "exit 1"; \ echo "exit 1"; \
exit 1; \ exit 1; \
fi fi
@@ -518,26 +260,21 @@ waste:
@echo 'haste' @echo 'haste'
@${TRUE} @${TRUE}
make: maker:
@echo 'We encourage you to attend a maker faire' @echo 'Participate in a maker faire'
@${TRUE} @${TRUE}
easter_egg: easter_egg:
@echo you expected to often mis-understand this $${RANDOM} magic @echo "you expected to often misunderstand this $${RANDOM} magic"
@echo chongo '<was here>' "/\\oo/\\" @echo "chongo '<was here>' /\\oo/\\"
@echo Eggy and Kitty @echo "Eggy"
fabricate fashion form frame manufacture produce: make sandwich: easter_egg
@${TRUE}
sandwich:
@if [ `id -u` -eq 0 ]; then \ @if [ `id -u` -eq 0 ]; then \
echo 'Okay.'; \ echo 'Okay.'; \
echo $${RANDOM}`date +%s`$${RANDOM} | \ echo "$${RANDOM}`date +%s`$${RANDOM}" > $@; \
${SHASUM} -a 512256 | \
${SED} -e 's/ .*//' > $@; \
else \ else \
echo 'Reall?!? Make it yourself.'; \ echo 'What? Make it yourself.'; \
exit 1; \ exit 1; \
fi fi
@@ -545,47 +282,47 @@ sandwich:
# as well as the West Coast Computer Faire and # as well as the West Coast Computer Faire and
# you might be confused different. :-) # you might be confused different. :-)
# #
supernova: nuke supernova: sandwich
@-if [ -r .code_anal ]; then \ @-if [ -r .code_anal ]; then \
${RM} -f .code_anal_v6; \ ${RM} -f .code_anal_v6; \
else \ else \
echo "planet deniers, like a few silly IAU members, are so cute when they try to defend their logic"; \ echo "planet deniers, like some members of the IAU, are so cute when they try to defend their logic"; \
fi fi
@echo A $@ helps ${MAKE} the elements that help form planets @echo "A $@ helps ${MAKE} the elements that help form planets"
@${TRUE} @${TRUE}
deep_magic: deep_magic: supernova
@-if [ -r .code_anal ]; then \ @-if [ -r .code_anal ]; then \
ccode_analysis --deep_magic 253d8c80830e2df66c018820004b3d4939821bbd7d781fc50d9e633797e44f65d1d62c707bb7e5a82c328a37bbf9ecb4c46fb56aa3f08641fcf45d10ba3c6081 --FNV1a_hash_512_bit "prog"; \ ccode_analysis --deep_magic 7889066cdbdf09b0408021754586e895be641cc9be29e7eafd3ca65359541f17 \
--FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
else \ else \
echo "Wrong! Do it again!"; \ echo "Wrong! Do it again!"; \
sleep 1; \ sleep 2; \
echo "Wrong! Do it again!"; \ echo "Wrong! Do it again!"; \
sleep 1; \ sleep 2; \
echo "Wrong! Do it again!"; \ echo "Wrong! Do it again!"; \
fi fi
@${TRUE} @${TRUE}
magic: deep_magic magic: deep_magic
@-if [ -r .code_anal ]; then \ @-if [ -r .code_anal ]; then \
ccode_analysis --level 391581 --mode 216193 --state Riesel --FNV1a_hash_512_bit "prog"; \ ccode_analysis --level 20003 --mode 5717175 --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \
else \ else \
echo "If you don't eat yer meat, you can't have any pudding!"; \ echo "If you don't eat yer meat, you can't have any pudding!"; \
echo "How can you have any pudding if you don't eat yer meat?!"; \ echo "How can you have any pudding if you don't eat yer meat?!"; \
echo "Be careful with that axe, Eugene."; \
fi fi
@${TRUE} @${TRUE}
# The IOCCC resident astronomer states # The IOCCC resident astronomer states
# #
charon: supernova charon: magic
@echo $@ is a dwarf planet @echo "$@ is a dwarf planet"
@echo dwarf is a type of planet @echo "dwarf is a type of planet"
@echo therefore we continue to tell the IAU that $@ is a planet @echo "therefore IAU, $@ is a planet"
pluto: supernova pluto: charon
${MAKE} charon ${MAKE} charon
@echo $@ is a dwarf planet @echo "$@ is a dwarf planet"
@echo dwarf is a type of planet @echo "dwarf is a type of planet"
@echo therefore, $@ is a planet @echo "therefore, $@ is a planet"
@echo having lots of planets is good feature because supernovae can help ${MAKE} a lot of them @echo "having lots of planets is good feature because supernovae can help ${MAKE} a lot of them"
+20 -12
View File
@@ -1,25 +1,31 @@
# Most misleading indentation # Most misleading indentation
```
tsoj <tsoj.tsoj@gmx.de> tsoj <tsoj.tsoj@gmx.de>
<https://gitlab.com/tsoj> <https://gitlab.com/tsoj>
```
## To build:
The code for this entry can be found in prog.c ```sh
make
```
## Judges' comments: ### To run:
### To use:
make
./prog
```sh
./prog
```
### Try: ### Try:
# Make your terminal as large as possible, possibly reduce your font size ```sh
# then... # Make your terminal as large as possible, possibly reduce your font size
./prog # then...
./prog
```
### Selected Judges Remarks: ## Judges' comments:
This game does not use curses, but you may end up cursing. This game does not use curses, but you may end up cursing.
@@ -27,6 +33,7 @@ The code is made more difficult to read using an innovative, right justified,
reverse indentation style. reverse indentation style.
## Author's comments: ## Author's comments:
#### Controls #### Controls
- Movement: - Movement:
`w` (forwards), `a` (left), `s` (backwards), `d` (right) `w` (forwards), `a` (left), `s` (backwards), `d` (right)
@@ -90,10 +97,11 @@ My best was **156**. If you beat that I'll send you the image of a very expensiv
#### Tips #### Tips
- Adjust your terminal size for different experiences - Adjust your terminal size for different experiences
- Run this program in a virtual console to immerse yourself in the game - Run this program in a virtual console to immerse yourself in the game
-----------------------------------------------------------------------------------------------------
## Copyright:
(c) Copyright 1984-2020, [Leo Broukhis, Simon Cooper, Landon Curt Noll][judges] - All rights reserved (c) Copyright 1984-2020, [Leo Broukhis, Simon Cooper, Landon Curt Noll][judges] - All rights reserved
This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License][cc]. This work is licensed under a [Creative Commons Attribution-ShareAlike 3.0 Unported License][cc].
[judges]: http://www.ioccc.org/judges.html [judges]: http://www.ioccc.org/judges.html
[cc]: http://creativecommons.org/licenses/by-sa/3.0/ [cc]: http://creativecommons.org/licenses/by-sa/3.0/
-----------------------------------------------------------------------------------------------------