From c7fe27c36e14cffa9f3b26012fea5ed65417aec4 Mon Sep 17 00:00:00 2001
From: Sergey Lapin <slapinid@gmail.com>
Date: Thu, 13 Mar 2025 21:29:53 +0300
Subject: [PATCH] Fix weird issue with flecs

---
 src/modules/stream/SCsub                              |  2 +-
 src/modules/stream/base_data.h                        |  2 +-
 src/modules/stream/buildings/SCsub                    |  1 +
 .../stream/buildings/building_layout_editor.cpp       |  2 +-
 src/modules/stream/buildings/element_data.h           |  2 +-
 src/modules/stream/flecs                              |  1 -
 src/modules/stream/flecs/SCsub                        | 11 +++++++++++
 src/modules/stream/npc/SCsub                          |  1 +
 8 files changed, 17 insertions(+), 5 deletions(-)
 delete mode 120000 src/modules/stream/flecs
 create mode 100644 src/modules/stream/flecs/SCsub

diff --git a/src/modules/stream/SCsub b/src/modules/stream/SCsub
index d02b83e..34b7a83 100644
--- a/src/modules/stream/SCsub
+++ b/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")
 
 
 
-
diff --git a/src/modules/stream/base_data.h b/src/modules/stream/base_data.h
index 6ea49bc..b5da083 100644
--- a/src/modules/stream/base_data.h
+++ b/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;
 
diff --git a/src/modules/stream/buildings/SCsub b/src/modules/stream/buildings/SCsub
index b20e4d9..ba43dd0 100644
--- a/src/modules/stream/buildings/SCsub
+++ b/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"])
diff --git a/src/modules/stream/buildings/building_layout_editor.cpp b/src/modules/stream/buildings/building_layout_editor.cpp
index 0af5030..f696abd 100644
--- a/src/modules/stream/buildings/building_layout_editor.cpp
+++ b/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
diff --git a/src/modules/stream/buildings/element_data.h b/src/modules/stream/buildings/element_data.h
index 40b543f..6d1af87 100644
--- a/src/modules/stream/buildings/element_data.h
+++ b/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)
diff --git a/src/modules/stream/flecs b/src/modules/stream/flecs
deleted file mode 120000
index 0e5aaa0..0000000
--- a/src/modules/stream/flecs
+++ /dev/null
@@ -1 +0,0 @@
-../../flecs/distr
\ No newline at end of file
diff --git a/src/modules/stream/flecs/SCsub b/src/modules/stream/flecs/SCsub
new file mode 100644
index 0000000..04ea685
--- /dev/null
+++ b/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"])
diff --git a/src/modules/stream/npc/SCsub b/src/modules/stream/npc/SCsub
index 998534f..18170ab 100644
--- a/src/modules/stream/npc/SCsub
+++ b/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"])