Fix build issue with custom build specifying FLECS_MONITOR and FLECS_…

…REST
SanderMertens · Sep 29, 2023 · 34c5a0d · 34c5a0d
1 parent e41500c
commit 34c5a0d
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 8 deletions.
diff --git a/flecs.c b/flecs.c
@@ -29937,7 +29937,7 @@ void FlecsMonitorImport(
 
     ECS_COMPONENT_DEFINE(world, EcsWorldSummary);
 
-#ifdef FLECS_META
+#if defined(FLECS_META) && defined(FLECS_UNITS)
     ecs_struct(world, {
         .entity = ecs_id(EcsWorldSummary),
         .members = {
@@ -43585,7 +43585,7 @@ void flecs_table_move_bitset_columns(
 /* Grow table column. When a column needs to be reallocated this function takes
  * care of correctly invoking ctor/move/dtor hooks. */
 static
-void* flecs_table_grow_column(
+void flecs_table_grow_column(
     ecs_world_t *world,
     ecs_column_t *column,
     int32_t to_add,
@@ -43650,8 +43650,6 @@ void* flecs_table_grow_column(
     }
 
     ecs_assert(column->data.size == dst_size, ECS_INTERNAL_ERROR, NULL);
-
-    return result;
 }
 
 /* Grow all data structures in a table */

diff --git a/src/addons/monitor.c b/src/addons/monitor.c
@@ -328,7 +328,7 @@ void FlecsMonitorImport(
 
     ECS_COMPONENT_DEFINE(world, EcsWorldSummary);
 
-#ifdef FLECS_META
+#if defined(FLECS_META) && defined(FLECS_UNITS)
     ecs_struct(world, {
         .entity = ecs_id(EcsWorldSummary),
         .members = {

diff --git a/src/storage/table.c b/src/storage/table.c
@@ -1317,7 +1317,7 @@ void flecs_table_move_bitset_columns(
 /* Grow table column. When a column needs to be reallocated this function takes
  * care of correctly invoking ctor/move/dtor hooks. */
 static
-void* flecs_table_grow_column(
+void flecs_table_grow_column(
     ecs_world_t *world,
     ecs_column_t *column,
     int32_t to_add,
@@ -1382,8 +1382,6 @@ void* flecs_table_grow_column(
     }
 
     ecs_assert(column->data.size == dst_size, ECS_INTERNAL_ERROR, NULL);
-
-    return result;
 }
 
 /* Grow all data structures in a table */

diff --git a/test/custom_builds/c/monitor_rest/include/monitor_rest.h b/test/custom_builds/c/monitor_rest/include/monitor_rest.h
@@ -0,0 +1,16 @@
+#ifndef MONITOR_REST_H
+#define MONITOR_REST_H
+
+/* This generated file contains includes for project dependencies */
+#include "monitor_rest/bake_config.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/test/custom_builds/c/monitor_rest/include/monitor_rest/bake_config.h b/test/custom_builds/c/monitor_rest/include/monitor_rest/bake_config.h
@@ -0,0 +1,24 @@
+/*
+                                   )
+                                  (.)
+                                  .|.
+                                  | |
+                              _.--| |--._
+                           .-';  ;`-'& ; `&.
+                          \   &  ;    &   &_/
+                           |"""---...---"""|
+                           \ | | | | | | | /
+                            `---.|.|.|.---'
+
+ * This file is generated by bake.lang.c for your convenience. Headers of
+ * dependencies will automatically show up in this file. Include bake_config.h
+ * in your main project file. Do not edit! */
+
+#ifndef MONITOR_REST_BAKE_CONFIG_H
+#define MONITOR_REST_BAKE_CONFIG_H
+
+/* Headers of public dependencies */
+#include "../../deps/flecs.h"
+
+#endif
+
diff --git a/test/custom_builds/c/monitor_rest/project.json b/test/custom_builds/c/monitor_rest/project.json
@@ -0,0 +1,14 @@
+{
+    "id": "monitor_rest",
+    "type": "application",
+    "value": {
+        "public": false,
+        "use": [
+            "flecs"
+        ],
+        "standalone": true
+    },
+    "lang.c": {
+        "defines": ["FLECS_CUSTOM_BUILD", "FLECS_MONITOR", "FLECS_REST", "FLECS_LOG"]
+    }
+}
diff --git a/test/custom_builds/c/monitor_rest/src/main.c b/test/custom_builds/c/monitor_rest/src/main.c
@@ -0,0 +1,10 @@
+#include <monitor_rest.h>
+
+int main(int argc, char *argv[]) {
+    ecs_world_t *world = ecs_init_w_args(argc, argv);
+
+    ECS_IMPORT(world, FlecsMonitor);
+    ECS_IMPORT(world, FlecsRest);
+
+    return ecs_fini(world);
+}