Mercurial > molko

changeset 316:1a6125ffebff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: fix many warnings and build on macOS
author David Demelier <markand@malikania.fr>
date Wed, 22 Sep 2021 12:57:55 +0200
parents 3bfaaf5342a9
children 764f65dfa46d
files CMakeLists.txt config.h.in libmlk-adventure/adventure/action/spawner.c libmlk-adventure/adventure/assets.c libmlk-adventure/adventure/dialog/save.c libmlk-adventure/adventure/item/potion.c libmlk-adventure/adventure/mapscene/mapscene.c libmlk-core/core/sys.c libmlk-core/core/zfile.c libmlk-port/CMakeLists.txt libmlk-port/port/config.h.in libmlk-port/port/port.h libmlk-rpg/rpg/battle-state-check.c libmlk-rpg/rpg/battle-state-item.c libmlk-rpg/rpg/battle-state-selection.c libmlk-rpg/rpg/save.c libmlk-rpg/rpg/selection.c
diffstat 17 files changed, 78 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Sep 22 10:04:15 2021 +0200
+++ b/CMakeLists.txt	Wed Sep 22 12:57:55 2021 +0200
@@ -57,12 +57,6 @@
 	find_package(ZSTD REQUIRED)
 endif ()
 
-configure_file(
-	${CMAKE_SOURCE_DIR}/config.h.in
-	${CMAKE_BINARY_DIR}/config.h
-)
-include_directories(${CMAKE_BINARY_DIR})
-
 add_subdirectory(extern/libsqlite)
 add_subdirectory(extern/libgreatest)
 
--- a/config.h.in	Wed Sep 22 10:04:15 2021 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-#cmakedefine MLK_WITH_NLS
-#cmakedefine MLK_WITH_ZSTD
-
-#cmakedefine MLK_HAS_STRLCPY
-#cmakedefine MLK_HAS_FMEMOPEN
-#cmakedefine MLK_HAS_BASENAME
-#cmakedefine MLK_HAS_DIRNAME
-#cmakedefine MLK_HAS_GETOPT
-#cmakedefine MLK_HAS_PATH_MAX
-#cmakedefine MLK_HAS_SSIZE_T
-
-#define MLK_PREFIX      "@CMAKE_INSTALL_PREFIX@"
-#define MLK_BINDIR      "@CMAKE_INSTALL_BINDIR@"
-#define MLK_DATADIR     "@CMAKE_INSTALL_DATADIR@"
-#define MLK_LOCALEDIR   "@CMAKE_INSTALL_LOCALEDIR@"
--- a/libmlk-adventure/adventure/action/spawner.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-adventure/adventure/action/spawner.c	Wed Sep 22 12:57:55 2021 +0200
@@ -48,6 +48,8 @@
 static void
 fight(struct spawner *s)
 {
+	(void)s;
+
 	struct battle *bt;
 
 	bt = alloc_new0(sizeof (*bt));
--- a/libmlk-adventure/adventure/assets.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-adventure/adventure/assets.c	Wed Sep 22 12:57:55 2021 +0200
@@ -29,8 +29,8 @@
 
 #include "assets.h"
 
-#define SPRITE(which, file, w, h)       { which, file, w, h }
-#define SOUND(which, file)              { which, file }
+#define SPRITE(which, file, w, h)       { .index = which, .path = file, .cellw = w, .cellh = h }
+#define SOUND(which, file)              { .index = which, .path = file }
 
 static struct {
 	enum assets_sprite index;
--- a/libmlk-adventure/adventure/dialog/save.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-adventure/adventure/dialog/save.c	Wed Sep 22 12:57:55 2021 +0200
@@ -129,6 +129,8 @@
 static void
 draw_save_faces(const struct dialog_save *dlg, const struct geo *geo, size_t i)
 {
+	(void)dlg;
+
 	/* TODO: determine face. */
 	for (size_t f = 0; f < TEAM_MAX; ++f) {
 		sprite_scale(&assets_sprites[ASSETS_SPRITE_FACES], 0, f,
@@ -145,7 +147,6 @@
 {
 	struct label label = {0};
 	char time[128], line[256];
-	struct save_property prop;
 
 	label.theme = dlg->theme;
 	label.x = geo->saves[i].lx;
@@ -277,7 +278,8 @@
 void
 dialog_save_update(struct dialog_save *dlg, unsigned int ticks)
 {
-	assert(dlg);
+	(void)ticks;
+	(void)dlg;
 }
 
 void
--- a/libmlk-adventure/adventure/item/potion.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-adventure/adventure/item/potion.c	Wed Sep 22 12:57:55 2021 +0200
@@ -48,6 +48,7 @@
 exec_battle(const struct item *item, struct battle *bt, struct character *src, struct character *tgt)
 {
 	(void)item;
+	(void)src;
 
 	heal(tgt);
 	battle_indicator_hp(bt, tgt, 50);
--- a/libmlk-adventure/adventure/mapscene/mapscene.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-adventure/adventure/mapscene/mapscene.c	Wed Sep 22 12:57:55 2021 +0200
@@ -77,6 +77,11 @@
 void
 load_spawner(struct map *m, int x, int y, int w, int h, const char *line)
 {
+	(void)x;
+	(void)y;
+	(void)w;
+	(void)h;
+
 	struct spawner *s;
 
 	s = alloc_new0(sizeof (*s));
@@ -112,12 +117,16 @@
 	return strncmp(key, ld->name, strlen(ld->name));
 }
 
+#if 0
+
 static int
 cmp_title(const char *key, const struct action_loader *ld)
 {
 	return strcmp(key, ld->name);
 }
 
+#endif
+
 void
 mapscene_load_action(struct map *m, int x, int y, int w, int h, const char *exec)
 {
@@ -142,9 +151,9 @@
 {
 	assert(m);
 
+#if 0
 	struct mapscene_loader *ld;
 
-#if 0
 	/* Same layout, can use cmp_title as well. */
 	if ((ld = SEARCH(m->title, mapscenes, sizeof (*ld), cmp_title)))
 		ld->load(m);
--- a/libmlk-core/core/sys.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-core/core/sys.c	Wed Sep 22 12:57:55 2021 +0200
@@ -67,16 +67,6 @@
 	return str;
 }
 
-static inline const char *
-absolute(const char *which)
-{
-	static char path[PATH_MAX];
-
-	strlcpy(path, which, sizeof (path));
-
-	return normalize(path);
-}
-
 static const char *
 system_directory(enum sys_dir kind)
 {
--- a/libmlk-core/core/zfile.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-core/core/zfile.c	Wed Sep 22 12:57:55 2021 +0200
@@ -133,7 +133,7 @@
 	assert(zf);
 	assert(path);
 
-	int fd, status;
+	int fd;
 
 	memset(zf, 0, sizeof (*zf));
 
--- a/libmlk-port/CMakeLists.txt	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-port/CMakeLists.txt	Wed Sep 22 12:57:55 2021 +0200
@@ -44,6 +44,11 @@
 	file(TOUCH ${CMAKE_BINARY_DIR}/unistd.h)
 endif ()
 
+configure_file(
+	${libmlk-port_SOURCE_DIR}/port/config.h.in
+	${libmlk-port_BINARY_DIR}/config.h
+)
+
 set(
 	SOURCES
 	${libmlk-port_SOURCE_DIR}/port/port.c
@@ -55,7 +60,9 @@
 	SOURCES ${SOURCES}
 	TYPE STATIC
 	INCLUDES
-		PUBLIC $<BUILD_INTERFACE:${libmlk-port_SOURCE_DIR}>
+		PUBLIC
+			$<BUILD_INTERFACE:${libmlk-port_SOURCE_DIR}>
+			$<BUILD_INTERFACE:${libmlk-port_BINARY_DIR}>
 )
 
 source_group(TREE ${libmlk-port_SOURCE_DIR} FILES ${SOURCES})
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libmlk-port/port/config.h.in	Wed Sep 22 12:57:55 2021 +0200
@@ -0,0 +1,38 @@
+/*
+ * config.h -- system configuration and polyfills
+ *
+ * Copyright (c) 2020-2021 David Demelier <markand@malikania.fr>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef MOLKO_CONFIG_H
+#define MOLKO_CONFIG_H
+
+#define MLK_PREFIX      "@CMAKE_INSTALL_PREFIX@"
+#define MLK_BINDIR      "@CMAKE_INSTALL_BINDIR@"
+#define MLK_DATADIR     "@CMAKE_INSTALL_DATADIR@"
+#define MLK_LOCALEDIR   "@CMAKE_INSTALL_LOCALEDIR@"
+
+#cmakedefine MLK_WITH_NLS
+#cmakedefine MLK_WITH_ZSTD
+
+#cmakedefine MLK_HAS_STRLCPY
+#cmakedefine MLK_HAS_FMEMOPEN
+#cmakedefine MLK_HAS_BASENAME
+#cmakedefine MLK_HAS_DIRNAME
+#cmakedefine MLK_HAS_GETOPT
+#cmakedefine MLK_HAS_PATH_MAX
+#cmakedefine MLK_HAS_SSIZE_T
+
+#endif /* !MOLKO_CONFIG_H */
--- a/libmlk-port/port/port.h	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-port/port/port.h	Wed Sep 22 12:57:55 2021 +0200
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef MOLKO_CORE_PORT_H
-#define MOLKO_CORE_PORT_H
+#ifndef MOLKO_PORT_H
+#define MOLKO_PORT_H
 
 #include "config.h"
 
@@ -95,4 +95,4 @@
 typedef long long int ssize_t;
 #endif
 
-#endif /* !MOLKO_CORE_PORT_H */
+#endif /* !MOLKO_PORT_H */
--- a/libmlk-rpg/rpg/battle-state-check.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-rpg/rpg/battle-state-check.c	Wed Sep 22 12:57:55 2021 +0200
@@ -42,7 +42,6 @@
 fadeout_update(struct action *act, unsigned int ticks)
 {
 	struct fadeout *fade = act->data;
-	struct character *ch = fade->ch;
 
 	fade->elapsed += ticks;
 
--- a/libmlk-rpg/rpg/battle-state-item.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-rpg/rpg/battle-state-item.c	Wed Sep 22 12:57:55 2021 +0200
@@ -79,6 +79,8 @@
 static void
 draw(const struct battle_state *st, const struct battle *bt)
 {
+	(void)bt;
+
 	struct self *self = st->data;
 
 	if (self->substate == SUBSTATE_MESSAGE)
@@ -105,7 +107,6 @@
 	assert(slot);
 
 	struct self *self;
-	unsigned int lw, lh;
 
 	if (!(self = alloc_new0(sizeof (*self))))
 		panic();
--- a/libmlk-rpg/rpg/battle-state-selection.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-rpg/rpg/battle-state-selection.c	Wed Sep 22 12:57:55 2021 +0200
@@ -197,6 +197,8 @@
              const struct battle_entity *entities,
              size_t entitiesz)
 {
+	(void)st;
+
 	for (size_t i = 0; i < entitiesz; ++i) {
 		const struct battle_entity *et = &entities[i];
 
@@ -224,7 +226,7 @@
 {
 	const struct select *select = st->data;
 
-	if (select->slt.index_character == -1) {
+	if (select->slt.index_character == -1U) {
 		/* All selected. */
 		if (select->slt.index_side == 0)
 			draw_cursors(st, bt, bt->enemies, UTIL_SIZE(bt->enemies));
--- a/libmlk-rpg/rpg/save.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-rpg/rpg/save.c	Wed Sep 22 12:57:55 2021 +0200
@@ -154,9 +154,6 @@
 	}
 
 	return 0;
-
-sqlite3_err:
-	return errorf("%s", sqlite3_errmsg(stmt->parent->handle));
 }
 
 int
--- a/libmlk-rpg/rpg/selection.c	Wed Sep 22 10:04:15 2021 +0200
+++ b/libmlk-rpg/rpg/selection.c	Wed Sep 22 12:57:55 2021 +0200
@@ -27,6 +27,8 @@
 static void
 random(struct selection *slt, const struct battle *bt, const struct battle_entity *entities, size_t entitiesz)
 {
+	(void)bt;
+
 	struct {
 		const struct battle_entity *entity;
 		size_t position;
@@ -51,6 +53,8 @@
 static void
 first(struct selection *slt, const struct battle *bt, const struct battle_entity *entities, size_t entitiesz)
 {
+	(void)bt;
+
 	for (size_t i = 0; i < entitiesz; ++i) {
 		if (battle_entity_ok(&entities[i])) {
 			slt->index_character = i;