From cb2376a82f1f556f23c47d435cd60af2abfc0138 Mon Sep 17 00:00:00 2001 From: yzrh Date: Wed, 30 Dec 2020 15:54:00 +0000 Subject: [PATCH 1/5] Rename binary. --- CHANGE.md | 5 +++++ src/Makefile | 18 +++++++++--------- src/{main.c => snake-sdl.c} | 0 src/version.h | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) rename src/{main.c => snake-sdl.c} (100%) diff --git a/CHANGE.md b/CHANGE.md index b4ab6b3..a0c1405 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -1,3 +1,8 @@ +0.6.2_5 (2020-12-30) +==================== + +* Rename binary. + 0.6.2_4 (2020-12-25) ==================== diff --git a/src/Makefile b/src/Makefile index 37533bd..f867d21 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -src = main.c collision.c game.c input.c renderer.c +src = snake-sdl.c collision.c game.c input.c renderer.c inc = extern.h game.h input.h renderer.h screen.h version.h .ifdef GPIO @@ -31,20 +31,20 @@ CFLAGS += -I/usr/local/include LDFLAGS += -L/usr/local/lib all: ${obj} ${inc} - ${CC} ${LDFLAGS} -o snake ${obj} + ${CC} ${LDFLAGS} -o snake-sdl ${obj} clean: - rm -f snake ${obj} + rm -f snake-sdl ${obj} install: install -d ${PREFIX}/bin - install -d ${PREFIX}/share/snake - install snake ${PREFIX}/bin - install -m644 ../contrib/font.ttf ${PREFIX}/share/snake - install -m644 ../contrib/music.flac ${PREFIX}/share/snake + install -d ${PREFIX}/share/snake-sdl + install snake-sdl ${PREFIX}/bin + install -m644 ../contrib/font.ttf ${PREFIX}/share/snake-sdl + install -m644 ../contrib/music.flac ${PREFIX}/share/snake-sdl deinstall: - rm -f ${PREFIX}/bin/snake - rm -rf ${PREFIX}/share/snake + rm -f ${PREFIX}/bin/snake-sdl + rm -rf ${PREFIX}/share/snake-sdl .PHONY: all clean install deinstall diff --git a/src/main.c b/src/snake-sdl.c similarity index 100% rename from src/main.c rename to src/snake-sdl.c diff --git a/src/version.h b/src/version.h index cd17685..874129a 100644 --- a/src/version.h +++ b/src/version.h @@ -7,4 +7,4 @@ #define VERSION "0" #define RELEASE "6" #define PATCH "2" -#define EXTRA "_4" +#define EXTRA "_5" From 22a1fd45694a17f735c3eab5a677ed80b824a5b4 Mon Sep 17 00:00:00 2001 From: yzrh Date: Fri, 1 Jan 2021 21:26:20 +0000 Subject: [PATCH 2/5] The year is 2021. --- src/Makefile | 4 +++- src/collision.c | 2 +- src/extern.h | 2 +- src/game.c | 2 +- src/game.h | 2 +- src/gpio.c | 2 +- src/gpio.h | 2 +- src/input.c | 2 +- src/input.h | 2 +- src/renderer.c | 2 +- src/renderer.h | 2 +- src/screen.h | 2 +- src/snake-sdl.c | 4 ++-- src/version.h | 2 +- 14 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/Makefile b/src/Makefile index f867d21..c176657 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,6 +1,8 @@ -# Copyright (c) 2019-2020, yzrh +# +# Copyright (c) 2019-2021, yzrh # # SPDX-License-Identifier: Apache-2.0 +# src = snake-sdl.c collision.c game.c input.c renderer.c inc = extern.h game.h input.h renderer.h screen.h version.h diff --git a/src/collision.c b/src/collision.c index 5810c84..66f710a 100644 --- a/src/collision.c +++ b/src/collision.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/extern.h b/src/extern.h index 482b9ed..4bdb1b9 100644 --- a/src/extern.h +++ b/src/extern.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/game.c b/src/game.c index 1a836d0..e6a5c33 100644 --- a/src/game.c +++ b/src/game.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/game.h b/src/game.h index a510c6c..b8439dc 100644 --- a/src/game.h +++ b/src/game.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/gpio.c b/src/gpio.c index 9d4cde1..2860f37 100644 --- a/src/gpio.c +++ b/src/gpio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/gpio.h b/src/gpio.h index 0b6b75d..cf02859 100644 --- a/src/gpio.h +++ b/src/gpio.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/input.c b/src/input.c index 46ba24a..8bb4048 100644 --- a/src/input.c +++ b/src/input.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/input.h b/src/input.h index 0446474..c72532d 100644 --- a/src/input.h +++ b/src/input.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/renderer.c b/src/renderer.c index c742e18..16948cb 100644 --- a/src/renderer.c +++ b/src/renderer.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/renderer.h b/src/renderer.h index b6de4d8..7e75cff 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/screen.h b/src/screen.h index 158cdaa..6783630 100644 --- a/src/screen.h +++ b/src/screen.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ diff --git a/src/snake-sdl.c b/src/snake-sdl.c index 48b8fc8..8ec1aa7 100644 --- a/src/snake-sdl.c +++ b/src/snake-sdl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ @@ -941,7 +941,7 @@ int main(void) { printf("Snake " VERSION "." RELEASE "." PATCH EXTRA "\n" - "Copyright (c) 2019-2020, yzrh \n"); + "Copyright (c) 2019-2021, yzrh \n"); if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | diff --git a/src/version.h b/src/version.h index 874129a..78edaf2 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, yzrh + * Copyright (c) 2019-2021, yzrh * * SPDX-License-Identifier: Apache-2.0 */ From 89cdfb6f237c2472999a3647dab3664c4e51472e Mon Sep 17 00:00:00 2001 From: yzrh Date: Fri, 29 Jan 2021 21:52:29 +0000 Subject: [PATCH 3/5] Update CFLAGS for GCC 10. --- CHANGE.md | 5 +++++ src/Makefile | 2 +- src/snake-sdl.c | 3 +-- src/version.h | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGE.md b/CHANGE.md index a0c1405..942a586 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -1,3 +1,8 @@ +0.6.2_6 (2020-12-30) +==================== + +* Update CFLAGS. + 0.6.2_5 (2020-12-30) ==================== diff --git a/src/Makefile b/src/Makefile index c176657..f54df80 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,7 +18,7 @@ obj = ${src:.c=.o} PREFIX = /usr/local -CFLAGS = -O3 -march=native -pipe -flto=thin -Wall -Wno-unused-result +CFLAGS = -O3 -march=native -pipe -flto -Wall -Wextra -Wno-unused-result -Wno-unused-parameter LDFLAGS = -Wl,-O3 -lpthread -lSDL2 -lSDL2_ttf .ifdef SOUND diff --git a/src/snake-sdl.c b/src/snake-sdl.c index 8ec1aa7..28268e0 100644 --- a/src/snake-sdl.c +++ b/src/snake-sdl.c @@ -1415,8 +1415,7 @@ main(void) text_score.cache = 0; if (flappy) { - delay.tv_nsec = TICK_TIME_INIT / - SCREEN_UNIT; + delay.tv_nsec /= SCREEN_UNIT; game_snake_init(&snake0, 0); diff --git a/src/version.h b/src/version.h index 78edaf2..eabf0a9 100644 --- a/src/version.h +++ b/src/version.h @@ -7,4 +7,4 @@ #define VERSION "0" #define RELEASE "6" #define PATCH "2" -#define EXTRA "_5" +#define EXTRA "_6" From 471a8b42d262ec1cc1324e357af178ded2e04555 Mon Sep 17 00:00:00 2001 From: yzrh Date: Mon, 19 Dec 2022 23:18:43 +0000 Subject: [PATCH 4/5] Update Makefile Signed-off-by: yzrh --- CHANGE.md | 5 +++++ src/Makefile | 6 +++--- src/snake-sdl.c | 4 ++-- src/version.h | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/CHANGE.md b/CHANGE.md index 942a586..d385a49 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -1,3 +1,8 @@ +0.6.2_7 (2022-12-19) +==================== + +* Update Makefile. + 0.6.2_6 (2020-12-30) ==================== diff --git a/src/Makefile b/src/Makefile index f54df80..21ccda9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2021, yzrh +# Copyright (c) 2019-2022, yzrh # # SPDX-License-Identifier: Apache-2.0 # @@ -18,8 +18,8 @@ obj = ${src:.c=.o} PREFIX = /usr/local -CFLAGS = -O3 -march=native -pipe -flto -Wall -Wextra -Wno-unused-result -Wno-unused-parameter -LDFLAGS = -Wl,-O3 -lpthread -lSDL2 -lSDL2_ttf +CFLAGS = -O2 -pipe -flto -Wall -Wextra -Wno-unused-result -Wno-unused-parameter +LDFLAGS = -Wl,-O2 -lpthread -lSDL2 -lSDL2_ttf .ifdef SOUND diff --git a/src/snake-sdl.c b/src/snake-sdl.c index 28268e0..47cf07e 100644 --- a/src/snake-sdl.c +++ b/src/snake-sdl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, yzrh + * Copyright (c) 2019-2022, yzrh * * SPDX-License-Identifier: Apache-2.0 */ @@ -941,7 +941,7 @@ int main(void) { printf("Snake " VERSION "." RELEASE "." PATCH EXTRA "\n" - "Copyright (c) 2019-2021, yzrh \n"); + "Copyright (c) 2019-2022, yzrh \n"); if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | diff --git a/src/version.h b/src/version.h index eabf0a9..10f4865 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2021, yzrh + * Copyright (c) 2019-2022, yzrh * * SPDX-License-Identifier: Apache-2.0 */ @@ -7,4 +7,4 @@ #define VERSION "0" #define RELEASE "6" #define PATCH "2" -#define EXTRA "_6" +#define EXTRA "_7" From 09cfe6cee9bc8ac36659f490515375e6a9abe45e Mon Sep 17 00:00:00 2001 From: yzrh Date: Mon, 9 Jan 2023 15:18:37 +0000 Subject: [PATCH 5/5] Fix compiler warnings. Signed-off-by: yzrh --- src/Makefile | 4 ++-- src/snake-sdl.c | 23 +++++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/Makefile b/src/Makefile index 21ccda9..67f1a2b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2022, yzrh +# Copyright (c) 2019-2023, yzrh # # SPDX-License-Identifier: Apache-2.0 # @@ -18,7 +18,7 @@ obj = ${src:.c=.o} PREFIX = /usr/local -CFLAGS = -O2 -pipe -flto -Wall -Wextra -Wno-unused-result -Wno-unused-parameter +CFLAGS = -O2 -pipe -flto -Wall -Wextra -Wno-unused-parameter LDFLAGS = -Wl,-O2 -lpthread -lSDL2 -lSDL2_ttf .ifdef SOUND diff --git a/src/snake-sdl.c b/src/snake-sdl.c index 47cf07e..587979d 100644 --- a/src/snake-sdl.c +++ b/src/snake-sdl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, yzrh + * Copyright (c) 2019-2023, yzrh * * SPDX-License-Identifier: Apache-2.0 */ @@ -108,19 +108,22 @@ static void* handler_rendering(void *args) { const SDL_Color fg = { - COLOUR_FOREGROUND_R, - COLOUR_FOREGROUND_G, - COLOUR_FOREGROUND_B + .r = COLOUR_FOREGROUND_R, + .g = COLOUR_FOREGROUND_G, + .b = COLOUR_FOREGROUND_B, + .a = 255 }; const SDL_Color bg = { - COLOUR_BACKGROUND_R, - COLOUR_BACKGROUND_G, - COLOUR_BACKGROUND_B + .r = COLOUR_BACKGROUND_R, + .g = COLOUR_BACKGROUND_G, + .b = COLOUR_BACKGROUND_B, + .a = 255 }; const SDL_Color bg_s = { - COLOUR_BACKGROUND_SHADE_R, - COLOUR_BACKGROUND_SHADE_G, - COLOUR_BACKGROUND_SHADE_B + .r = COLOUR_BACKGROUND_SHADE_R, + .g = COLOUR_BACKGROUND_SHADE_G, + .b = COLOUR_BACKGROUND_SHADE_B, + .a = 255 }; char result_str[23];