From 2f2fed5907c8415d42737dea104c9a0671b0ebbf Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 7 Mar 2023 21:53:27 -0800 Subject: [PATCH] remove orig code from 2014/maffiodo1 --- 2014/maffiodo1/Makefile | 292 ++++++++++++++++++++++++++----------- 2014/maffiodo1/README.md | 7 +- 2014/maffiodo1/prog.orig.c | 72 --------- 3 files changed, 209 insertions(+), 162 deletions(-) delete mode 100644 2014/maffiodo1/prog.orig.c diff --git a/2014/maffiodo1/Makefile b/2014/maffiodo1/Makefile index c469e76a4..897b26ffa 100644 --- a/2014/maffiodo1/Makefile +++ b/2014/maffiodo1/Makefile @@ -1,166 +1,251 @@ #!/usr/bin/env make # -# 2014 makefile +# IOCCC 2014 winning entry - maffiodo1 + +################################################################################ # -# This work by Landon Curt Noll, Simon Cooper, and Leonid A. Broukhis -# is licensed under: +# Regarding individual entries: +# +# 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. # # See: http://creativecommons.org/licenses/by-sa/3.0/ -################ -# tool locations -################ +############################# +# shell used by this Makefile +############################# # SHELL= bash -CP= cp -CPP= cpp -GUNZIP= gunzip -LD= ld -MAKE= make -RM= rm -SED= sed -TAR= tar -TRUE= true + +####################### +# common tool locations +####################### +# +include ../../var.mk # Set X11_LIBDIR to the directory where the X11 library resides # -X11_LIBDIR= /usr/X11R6/lib +#X11_LIBDIR= /usr/X11R6/lib +#X11_LIBDIR= /usr/X11/lib +X11_LIBDIR= /opt/X11/lib # Set X11_INCLUDEDIR to the directory where the X11 include files reside # -X11_INCDIR= /usr/X11R6/include +#X11_INCDIR= /usr/X11R6/include +#X11_INCDIR= /usr/X11/include +X11_INCDIR= /opt/X11/include -# Set SDL_LIBDIR to the directory where the SDL library resides +# Common C compiler warnings to silence # -SDL_LIBDIR= $(shell sdl-config --libs) +#CSILENCE= +CSILENCE= -Wno-error -Wno-implicit-function-declaration \ + -Wno-incompatible-function-pointer-types -Wno-incompatible-pointer-types \ + -Wno-int-conversion -Wno-missing-field-initializers -Wno-parentheses \ + -Wno-pointer-sign -Wno-return-type -Wno-unused-parameter -Wno-implicit-int -# Set SDL_INCDIR to top level directory under where the SDL/SDL.h include file resides +# Common C compiler warning flags # -SDL_INCDIR= $(shell sdl-config --cflags) +#CWARN= ${CSILENCE} +#CWARN= -Wall ${CSILENCE} +CWARN= -Wall -Wextra ${CSILENCE} +#CWARN= -Wall -Wextra -pedantic ${CSILENCE} -# Compiler warnings -# -#CWARN= -CWARN= -Wall -#CWARN= -Wall -pedantic - -# compiler standard +# Compiler standard # #CSTD= #CSTD= -ansi -CSTD= -std=c11 +CSTD= -std=gnu11 -# compiler bit architecture +# Compiler bit architecture # # Some entries require 32-bitness: # ARCH= -m32 # -# Some entries require 64-bitess: +# Some entries require 64-bitness: # ARCH= -m64 # # By default we assume nothing: # ARCH= -# optimization +# Defines that are needed to compile +# +CDEFINE= +#CDEFINE= -DIOCCC + +# Include files that are needed to compile +# +#CINCLUDE= +#CINCLUDE= -include stdlib.h +#CINCLUDE= -include stdio.h +#CINCLUDE= -include stdlib.h -include stdio.h +#CINCLUDE= -I ${X11_INCDIR} +CINCLUDE= -I ${HOMEBREW_PREFIX}/include/SDL2 + +# Optimization # # Most compiles will safely use -O2. Some can use only -O1 or -O. # A few compilers have broken optimizers or this entry make break # under those buggy optimizers and thus you may not want anything. +# Reasonable compilers will allow for -O3. # #OPT= #OPT= -O #OPT= -O1 -OPT= -O2 -#OPT= -O3 +#OPT= -O2 +OPT= -O3 + +# Default flags for ANSI C compilation +# +CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} # Libraries needed to build # -LIBS= -lSDL +#LIBS= +#LIBS= -lm +#LIBS= -L ${X11_LIBDIR} -lX11 +LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL2 -# default flags for ANSI C compilation -# -CFLAGS= ${CWARN} ${CSTD} ${ARCH} ${OPT} - -# ANSI compiler -# -# 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. +# C compiler to use # CC= cc #CC=clang -MAY_NEED_GCC= gcc +#CC=gcc + +# Compiler add-ons or replacements for clang only +# +ifeq ($(CC),clang) +# +CSILENCE+= -Wno-comma -Wno-documentation -Wno-extra-semi -Wno-implicit-int \ + -Wno-missing-prototypes -Wno-missing-variable-declarations -Wno-padded \ + -Wno-pedantic -Wno-poison-system-directories -Wno-shadow \ + -Wno-shorten-64-to-32 -Wno-sign-conversion -Wno-strict-prototypes +# +CWARN+= -Weverything +# +endif + +# Specific add-ons or replacements for gcc only +# +ifeq ($(CC),gcc) +# +#CSILENCE+= +# +#CWARN+= +# +endif ############################## # Special flags for this entry ############################## # -ENTRY= prog -DATA= -ALT_OBJ= prog.orig.o -ALT_ENTRY= prog.orig +ENTRY= maffiodo1 +PROG= prog +# +OBJ= ${PROG}.o +DATA= giana.level giana.rgba giana8.wav mario.level mario.rgba mario8.wav \ + screenshot-giana.png screenshot-mario.png +TARGET= ${PROG} +# +ALT_OBJ= +ALT_TARGET= ################# # build the entry ################# # -all: ${ENTRY} ${DATA} +all: data ${TARGET} @${TRUE} -${ENTRY}: ${ENTRY}.c - ${CC} ${CFLAGS} ${SDL_INCDIR} ${SDL_LIBDIR} $< -o $@ ${LIBS} +.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} # alternative executable # -alt: ${ALT_ENTRY} +alt: data ${ALT_TARGET} @${TRUE} -${ALT_ENTRY}: ${ALT_ENTRY}.c - ${CC} ${CFLAGS} ${SDL_INCDIR} ${SDL_LIBDIR} $< -o $@ ${LIBS} - # data files # data: ${DATA} @${TRUE} +# both all and alt +# +everything: all alt + ############### # utility rules ############### # -everything: all alt - clean: - ${RM} -f ${ENTRY}.o ${ALT_OBJ} + ${RM} -f ${OBJ} ${ALT_OBJ} + @-if [ -f indent.c ]; then \ + echo ${RM} -f indent.c; \ + ${RM} -f indent.c; \ + fi clobber: clean - ${RM} -f ${ENTRY} ${ALT_ENTRY} - -nuke: clobber - @${TRUE} - -dist_clean: nuke - @${TRUE} + ${RM} -f ${TARGET} ${ALT_TARGET} + @-if [ -e sandwich ]; then \ + ${RM} -f sandwich; \ + echo 'ate sandwich'; \ + fi install: - @echo "Surely we are joking Dr. Science!" + @echo "Dr. Spock says that is not logical!" @${TRUE} -# backwards compatibility +# you may be able to misunderstand the source by reading indent.c # -build: all - @${TRUE} +indent.c: ${PROG}.c + @if which "${GINDENT}" >/dev/null 2>&1; then \ + echo ${RM} -f $@; \ + ${RM} -f $@; \ + echo "${GINDENT} < $< > $@"; \ + ${GINDENT} < $< > $@; \ + elif which "${INDENT}" >/dev/null 2>&1; then \ + echo ${RM} -f $@; \ + ${RM} -f $@; \ + echo "${INDENT} < $< > $@"; \ + ${INDENT} < $< > $@; \ + else \ + echo "no intent tool found, ident $< yourself, sorry"; \ + echo "exit 1"; \ + exit 1; \ + fi ################## @@ -179,35 +264,70 @@ waste: @echo 'haste' @${TRUE} +maker: + @echo 'Participate in a maker faire' + @${TRUE} + easter_egg: - @echo you expected to sometimes mis-understand this $${RANDOM} magic - @echo chongo '' "/\\oo/\\" - @echo Readers shall not be disallowed from failong to be unable to not partly misunderstand this partocular final echo. + @echo "you expected to often misunderstand this $${RANDOM} magic" + @echo "chongo '' /\\oo/\\" + @echo "Eggy" + +sandwich: easter_egg + @if [ `id -u` -eq 0 ]; then \ + echo 'Okay.'; \ + echo "$${RANDOM}`date +%s`$${RANDOM}" > $@; \ + else \ + echo 'What? Make it yourself.'; \ + exit 1; \ + fi # Understand the history of the Homebrew Computer Club # as well as the West Coast Computer Faire and # you might be confused different. :-) # -supernova: nuke +supernova: sandwich @-if [ -r .code_anal ]; then \ - ${RM} -f .code_anal_v4; \ + ${RM} -f .code_anal_v6; \ else \ - echo "We are not expected to understand that"; \ + echo "planet deniers, like some members of the IAU, are so cute when they try to defend their logic"; \ fi + @echo "A $@ helps ${MAKE} the elements that help form planets" @${TRUE} -deep_magic: +deep_magic: supernova @-if [ -r .code_anal ]; then \ - ccode_analysis --deep_magic 2ed3582ec5c094a093fea2a6bcb9f19439892873c9cc45ed1ceaafe08b7d52e1b2c7cd524be3b0b2 --FNV1a_hash 512-bit "${ENTRY}"; \ + ccode_analysis --deep_magic 7889066cdbdf09b0408021754586e895be641cc9be29e7eafd3ca65359541f17 \ + --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \ else \ - echo "You are holding it wrong!"; \ + echo "Wrong! Do it again!"; \ + sleep 2; \ + echo "Wrong! Do it again!"; \ + sleep 2; \ + echo "Wrong! Do it again!"; \ fi @${TRUE} magic: deep_magic @-if [ -r .code_anal ]; then \ - ccode_analysis --mode 391581 --level 216193 --FNV1a_hash 512-bit "${ENTRY}"; \ + ccode_analysis --level 20003 --mode 5717175 --FNV1a_hash_512_bit -v2 "${PROG}" "${PROG}.c"; \ else \ - echo "These aren't the primes you're looking for Pauline!"; \ + 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?!"; \ fi @${TRUE} + +# The IOCCC resident astronomer states +# +charon: magic + @echo "$@ is a dwarf planet" + @echo "dwarf is a type of planet" + @echo "therefore IAU, $@ is a planet" + +pluto: charon + ${MAKE} charon + @echo "$@ is a dwarf planet" + @echo "dwarf is a type of planet" + @echo "therefore, $@ is a planet" + @echo "having lots of planets is good feature because supernovae can help ${MAKE} a lot of them" + diff --git a/2014/maffiodo1/README.md b/2014/maffiodo1/README.md index 15b5162dd..25eb0a9b4 100644 --- a/2014/maffiodo1/README.md +++ b/2014/maffiodo1/README.md @@ -4,11 +4,9 @@ Sandro Maffiodo +## To build: -## Judges' comments: -### To build: - - make + make all ### To run: @@ -26,6 +24,7 @@ A classic for a particular generation. Like all good programs, being data driven means you can do fun things in small spaces. ## Author's comments: + ### Remarks Use tabsize=4 to see the magic diff --git a/2014/maffiodo1/prog.orig.c b/2014/maffiodo1/prog.orig.c deleted file mode 100644 index 5ab785dfd..000000000 --- a/2014/maffiodo1/prog.orig.c +++ /dev/null @@ -1,72 +0,0 @@ - #include /*!!TAB=4!*/ - #include /*IOCCC2*/"SDL/SDL.h" - #define b/*{{IOCCC257}}*/ if ( - #define a(b, c) for (b = 0 ; /*IOCCC/2014*/bI?I:m); a(X,0){ b Z(X - ,m,n,o)){ bg=B&1; b D&&bg) continue; - m-=be; n-=bf; b B&8){ u[-1]=0; j=1; bc(8); b B&32){ n-= i; - o=i*2; } } b B&16&&!O){ bc(32+(o>i?8:0)); Y(); u[- 1]=0; } - b(B&128&&bf&&s<0)||(B&64))u[-1]=0; b bg&&!O){ b bf&&s >0){ - u[2]--; u[3]=bf=0; s=-6; } else { b j){ bc(0); b o>i) n+=o=i; D=30; j=0; - } else { bc(24); Y(); L=-1; } } } b B&4){ b bf&&s<0){ int I[]={ x,y-i,u[ - 5],u[4],rand()%2?1:-1,2} ; u[2]++; u[3]=2; ba(I); } } b bf)s=1; break; } - } } bh (m,e,k, bi){ H=k/ 2; G[bi]=m>e-H? k - - e:(m>H?H-m:0 ); } bj(X,be ,bf){ int bk ; - u [0]+=be; u[1 ]+=bf; W(X); E=x,F=y,I=0; a - ( bk,0){ b I=(X!=bk&&Z(bk,E,F,i)&&(B&6 ) - ) )break; } W(X); b I){ b bf)u[1]-=bf; b - be ){ u[0]-=be; u[4]*=-1*be; } } W( X); } - bl (){ int bm=n,X; SDL_FillRect(U,0,M); X=4; while( X - -- )bd(r,0); X=3; while(X--)bd(0,s); b n>h&&!O)Y () ; - t =bm==n; q[0]=m; q[1]=n; bh(m,e,k,0); bh(n,h,l,1) ; - a(X,0){ b W(X)){ b B&9){ bj(X,u[4],0); bj(X,0,2); } b B&1){ *u +=u[4]; b - ++u[5]>20){ u[4]*= -1; u[5]=0; } z+=K - %2?i:0; } J=i; b q ==u){ J=o; b!O){ b - r)z+=i*(K%2); b!t) z=48; z+=p<0?i*4:0 - ; }} b q!=u||!(D&& 0==D%3)){ SDL_Rect - bn={ z,A,i,J} ,bo= { G[0]+x,G[1]+y,i, - J}; SDL_BlitSurface (V,&bn,U,&bo); } } - } b(s+=2)>2)s=2; K ++; D-=D?1:0; b O) - b!-- O) exit(L); } bp(X){ return strtol - (T[X],0,0); } bq(int H , int*br,int bs ){ int bt; - bt=Q-P; b bt>bs) bt= bs; SDL_MixAudio(br,S +P,bt, - 128); P+=bt; b P>=Q)P=0; } SDL_AudioSpec bu={8000 - ,8,1,0,256,0,0,bq} ,bv ; main(int bw,char**bx){ T - - - =bx; int by,H=255, bz=H<<8 ,bA =bz <<8,bB= bA<<8, - bC=bp(5),bD=bp(6); SDL_Event bE; o =i= bC / 8; k = bp(1) - ,l=bp(2),e=bp(3),h =bp (4); M= bp(9); /**/ SDL_Init(/*<2053"*/ - 0xffff ); b!*(char*) &N){ H=bB; bz =bA; bA =bz>>8; - bB=255 ; } U=SDL_SetVideoMode(k,l,0,0); V=/*NES HISTORY - SANDRO */ SDL_CreateRGBSurface(1 <<15 , bC, bD, 32,H,bz - ,bA,bB); fread(V-> pixels,bC*bD*4,1,fopen(T [7],"r" )); SDL_OpenAudio(& - bu,0); SDL_LoadWAV (T[8],& bv,&S,&Q ); /**/ SDL_PauseAudio(0); - for(; ; ){ int u[6 ],*I; H =0 ; while (H < 6) scanf(/*0*/ - "%d ", u+H++); b u[5]< 0)break ; I=ba( - u);b!u [3]){ q =I+1; m =u[0 ]; n=u[1]; - } } for (; ; ){ while/* !MAFFIO DO.S*/( - SDL_PollEvent(&bE) ) { by= bE.type ==3; b!O &&(by|| bE. - type==2)){ I = bE. key/**/ .keysym .sym; b I== 276)r= - by?0:(p=-1); b I== 275 )r= by?0:(p =1); b I==32)by? - - 0:(t?(s=-9):0); b I==27)exit(0); } } bl(); SDL_Flip(U); SDL_Delay(60); } }