Fix compiler warnings.

Signed-off-by: yzrh <yzrh@noema.org>

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)
 ====================
 

src/Makefile

@@ -1,8 +1,10 @@
-# Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+#
+# Copyright (c) 2019-2023, yzrh <yzrh@noema.org>
 #
 # 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
+CFLAGS = -O2 -pipe -flto -Wall -Wextra -Wno-unused-parameter
-LDFLAGS = -Wl,-O3 -lpthread -lSDL2 -lSDL2_ttf
+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 -d ${PREFIX}/share/snake-sdl
-	install snake ${PREFIX}/bin
+	install snake-sdl ${PREFIX}/bin
-	install -m644 ../contrib/font.ttf ${PREFIX}/share/snake
+	install -m644 ../contrib/font.ttf ${PREFIX}/share/snake-sdl
-	install -m644 ../contrib/music.flac ${PREFIX}/share/snake
+	install -m644 ../contrib/music.flac ${PREFIX}/share/snake-sdl
 
 deinstall:
-	rm -f ${PREFIX}/bin/snake
+	rm -f ${PREFIX}/bin/snake-sdl
-	rm -rf ${PREFIX}/share/snake
+	rm -rf ${PREFIX}/share/snake-sdl
 
 .PHONY: all clean install deinstall

src/collision.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/extern.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/game.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/game.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/gpio.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/gpio.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/input.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/input.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/renderer.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/renderer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/screen.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2021, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */

src/snake-sdl.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2023, yzrh <yzrh@noema.org>
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -108,19 +108,22 @@ static void*
 handler_rendering(void *args)
 {
 	const SDL_Color fg = {
-		COLOUR_FOREGROUND_R,
+		.r = COLOUR_FOREGROUND_R,
-		COLOUR_FOREGROUND_G,
+		.g = COLOUR_FOREGROUND_G,
-		COLOUR_FOREGROUND_B
+		.b = COLOUR_FOREGROUND_B,
+		.a = 255
 	};
 	const SDL_Color bg = {
-		COLOUR_BACKGROUND_R,
+		.r = COLOUR_BACKGROUND_R,
-		COLOUR_BACKGROUND_G,
+		.g = COLOUR_BACKGROUND_G,
-		COLOUR_BACKGROUND_B
+		.b = COLOUR_BACKGROUND_B,
+		.a = 255
 	};
 	const SDL_Color bg_s = {
-		COLOUR_BACKGROUND_SHADE_R,
+		.r = COLOUR_BACKGROUND_SHADE_R,
-		COLOUR_BACKGROUND_SHADE_G,
+		.g = COLOUR_BACKGROUND_SHADE_G,
-		COLOUR_BACKGROUND_SHADE_B
+		.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 <yzrh@noema.org>\n");
+		"Copyright (c) 2019-2022, yzrh <yzrh@noema.org>\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 /
+						delay.tv_nsec /= SCREEN_UNIT;
-							SCREEN_UNIT;
 
 						game_snake_init(&snake0, 0);
 

src/version.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2020, yzrh <yzrh@noema.org>
+ * Copyright (c) 2019-2022, yzrh <yzrh@noema.org>
  *
  * 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"