Fix weird issue with flecs

src/modules/stream/SCsub

@@ -8,6 +8,7 @@ Import("env_modules")
 env_stream = env_modules.Clone()
 env_stream.module_obj = []
 env_stream.Append(CPPPATH=["../../meshoptimizer/src"])
+env_stream.Append(CPPPATH=["../../flecs/distr"])
 env_stream.Append(CPPPATH=["./event"])
 env_stream.add_source_files(env_stream.module_obj, "*.cpp")
 env.modules_sources += env_stream.module_obj
@@ -21,4 +22,3 @@ SConscript("flecs/SCsub")
 
 
 
-

src/modules/stream/base_data.h

@@ -1,6 +1,6 @@
 #ifndef BASE_DATA_H
 #define BASE_DATA_H
-#include "flecs/flecs.h"
+#include "flecs.h"
 class BaseData {
 	flecs::world ecs;
 

src/modules/stream/buildings/SCsub

@@ -17,3 +17,4 @@ env.Prepend(LIBS=[lib])
 env.Prepend(CPPPATH=[".."])
 env.Prepend(CPPPATH=["../event"])
 env.Prepend(CPPPATH=["../../../meshoptimizer/src"])
+env.Prepend(CPPPATH=["../../../flecs/distr"])

src/modules/stream/buildings/building_layout_editor.cpp

@@ -18,7 +18,7 @@
 #include <scene/gui/button.h>
 #include <scene/gui/menu_button.h>
 #include <editor/editor_node.h>
-#include <flecs/flecs.h>
+#include <flecs.h>
 namespace meshoptimizer
 {
 #define MESHOPTIMIZER_EXPERIMENTAL static

src/modules/stream/buildings/element_data.h

@@ -7,7 +7,7 @@
 #include <scene/main/node.h>
 #include <core/engine.h>
 #include <editor/editor_node.h>
-#include <flecs/flecs.h>
+#include <flecs.h>
 #include "base_data.h"
 #include "editor_event.h"
 template <class T> T *get_as_node(const String &path)

src/modules/stream/flecs

@@ -1 +0,0 @@
-../../flecs/distr

src/modules/stream/flecs/SCsub

@@ -0,0 +1,11 @@
+Import("env")
+Import("env_modules")
+
+env.stream_building_sources = []
+
+env.add_source_files(env.stream_building_sources, "../../../flecs/distr/*.c")
+
+lib = env.add_library("flecs", env.stream_building_sources)
+env.Prepend(LIBS=[lib])
+env.Prepend(CPPPATH=["../../../flecs/distr"])
+env.Prepend(CFLAGS=["-Wno-shadow=compatible-local", "-Wno-maybe-uninitialized"])

src/modules/stream/npc/SCsub

@@ -9,6 +9,7 @@ env_stream.add_source_files(env_stream.stream_building_sources, "*.cpp")
 lib = env_stream.add_library("npc", env_stream.stream_building_sources)
 env.Append(LIBS=[lib])
 env_stream.Prepend(CPPPATH=[".."])
+env_stream.Prepend(CPPPATH=["../../../flecs/distr"])
 env_stream.Prepend(CPPPATH=["../../../meshoptimizer/src"])
 env_stream.Prepend(CPPPATH=["../event"])
 env_stream.Prepend(CPPPATH=["../persistent_data"])