From 3947de42cde332ec00493225cc2cfda3bd193243 Mon Sep 17 00:00:00 2001 From: Landon Curt Noll Date: Tue, 7 Mar 2023 18:38:02 -0800 Subject: [PATCH] changed recently updated Makefiles to use -std=gnu17 --- 2018/bellard/Makefile | 29 ++++++++++++++--------------- 2018/ciura/Makefile | 2 +- 2018/endoh1/Makefile | 2 +- 2019/ciura/Makefile | 2 +- 2020/endoh1/Makefile | 2 +- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/2018/bellard/Makefile b/2018/bellard/Makefile index 809d2003b..1c5ad14f5 100644 --- a/2018/bellard/Makefile +++ b/2018/bellard/Makefile @@ -1,6 +1,6 @@ #!/usr/bin/env make # -# IOCCC 2018 winning entry /- bellard +# IOCCC 2020 winning entry - endoh1 ################################################################################ # @@ -62,17 +62,15 @@ X11_INCDIR= /opt/X11/include # Common C compiler warnings to silence # -#CSILENCE= -CSILENCE= -Wno-error -Wno-implicit-function-declaration -Wno-implicit-int \ - -Wno-logical-op-parentheses -Wno-main -Wno-parentheses -Wno-return-type \ - -Wno-shift-op-parentheses +CSILENCE= +#CSILENCE= -Wno-implicit-int # Common C compiler warning flags # #CWARN= ${CSILENCE} #CWARN= -Wall ${CSILENCE} -CWARN= -Wall -Wextra ${CSILENCE} -#CWARN= -Wall -Wextra -pedantic ${CSILENCE} +#CWARN= -Wall -Wextra ${CSILENCE} +CWARN= -Wall -Wextra -pedantic ${CSILENCE} # Compiler standard # @@ -125,8 +123,8 @@ CFLAGS= ${CSTD} ${CWARN} ${ARCH} ${CDEFINE} ${CINCLUDE} ${OPT} # Libraries needed to build # -LIBS= -#LIBS= -lm +#LIBS= +LIBS= -lcurses #LIBS= -L ${X11_LIBDIR} -lX11 #LIBS= -L ${HOMEBREW_PREFIX}/lib -lSDL @@ -140,9 +138,7 @@ CC= cc # ifeq ($(CC),clang) # -CSILENCE+= -Wno-conditional-uninitialized -Wno-missing-prototypes \ - -Wno-missing-variable-declarations -Wno-pedantic \ - -Wno-poison-system-directories -Wno-strict-prototypes +#CSILENCE+= # CWARN+= -Weverything # @@ -163,15 +159,15 @@ endif # Special flags for this entry ############################## # -ENTRY= bellard +ENTRY= endoh1 PROG= prog # OBJ= ${PROG}.o DATA= TARGET= ${PROG} # -ALT_OBJ= -ALT_TARGET= +ALT_OBJ= ${PROG}.alt.o +ALT_TARGET= ${PROG}.alt ################# @@ -188,6 +184,9 @@ all: data ${TARGET} ${PROG}: ${PROG}.c ${CC} ${CFLAGS} $< -o $@ ${LIBS} +${PROG}.alt: ${PROG}.alt.c + ${CC} ${CFLAGS} $< -o $@ ${LIBS} + # alternative executable # alt: data ${ALT_TARGET} diff --git a/2018/ciura/Makefile b/2018/ciura/Makefile index 37ab7bd75..b7155bdaf 100644 --- a/2018/ciura/Makefile +++ b/2018/ciura/Makefile @@ -76,7 +76,7 @@ CWARN= -Wall -Wextra -pedantic ${CSILENCE} # #CSTD= #CSTD= -ansi -CSTD= -std=gnu90 +CSTD= -std=gnu17 # Compiler bit architecture # diff --git a/2018/endoh1/Makefile b/2018/endoh1/Makefile index 8622993f8..52c6b95ab 100644 --- a/2018/endoh1/Makefile +++ b/2018/endoh1/Makefile @@ -76,7 +76,7 @@ CWARN= -Wall -Wextra -pedantic ${CSILENCE} # #CSTD= #CSTD= -ansi -CSTD= -std=gnu90 +CSTD= -std=gnu17 # Compiler bit architecture # diff --git a/2019/ciura/Makefile b/2019/ciura/Makefile index a74f94808..7472670ac 100644 --- a/2019/ciura/Makefile +++ b/2019/ciura/Makefile @@ -76,7 +76,7 @@ CWARN= -Wall -Wextra -pedantic ${CSILENCE} # #CSTD= #CSTD= -ansi -CSTD= -std=gnu90 +CSTD= -std=gnu17 # Compiler bit architecture # diff --git a/2020/endoh1/Makefile b/2020/endoh1/Makefile index 5c6e0e0d2..9219c2f68 100644 --- a/2020/endoh1/Makefile +++ b/2020/endoh1/Makefile @@ -76,7 +76,7 @@ CWARN= -Wall -Wextra -pedantic ${CSILENCE} # #CSTD= #CSTD= -ansi -CSTD= -std=gnu90 +CSTD= -std=gnu17 # Compiler bit architecture #