diff --git a/CHANGE.md b/CHANGE.md index b4ab6b3..d385a49 100644 --- a/CHANGE.md +++ b/CHANGE.md @@ -1,3 +1,18 @@ +0.6.2_7 (2022-12-19) +==================== + +* Update Makefile. + +0.6.2_6 (2020-12-30) +==================== + +* Update CFLAGS. + +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..67f1a2b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,8 +1,10 @@ -# Copyright (c) 2019-2020, yzrh +# +# Copyright (c) 2019-2023, yzrh # # 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 @@ -16,8 +18,8 @@ obj = ${src:.c=.o} PREFIX = /usr/local -CFLAGS = -O3 -march=native -pipe -flto=thin -Wall -Wno-unused-result -LDFLAGS = -Wl,-O3 -lpthread -lSDL2 -lSDL2_ttf +CFLAGS = -O2 -pipe -flto -Wall -Wextra -Wno-unused-parameter +LDFLAGS = -Wl,-O2 -lpthread -lSDL2 -lSDL2_ttf .ifdef SOUND @@ -31,20 +33,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/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/main.c b/src/snake-sdl.c similarity index 98% rename from src/main.c rename to src/snake-sdl.c index 48b8fc8..587979d 100644 --- a/src/main.c +++ b/src/snake-sdl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, 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]; @@ -941,7 +944,7 @@ int main(void) { printf("Snake " VERSION "." RELEASE "." PATCH EXTRA "\n" - "Copyright (c) 2019-2020, yzrh \n"); + "Copyright (c) 2019-2022, yzrh \n"); if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | @@ -1415,8 +1418,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 cd17685..10f4865 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2020, 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 "_4" +#define EXTRA "_7"