Support Emscripten

.github/workflows/ci.yml

@@ -52,6 +52,31 @@ jobs:
         run: |
           bake --strict
 
+  build-emscripten:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install compiler
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y emscripten
+
+      - name: install bake
+        run: |
+          git clone https://github.com/SanderMertens/bake
+          make -C bake/build-$(uname)
+          bake/bake setup
+          bake/bake setup --target em
+
+      - name: build flecs
+        run: |
+          bake --strict --target em
+
   build-windows:
     runs-on: windows-latest
     timeout-minutes: 30
@@ -232,6 +257,45 @@ jobs:
           cmake -DFLECS_STRICT=ON ..
           cmake --build . -j 4
 
+  build-cmake-emscripten:
+    needs: build-emscripten
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install compiler
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y emscripten
+
+      - name: create cmake build folders
+        run: |
+          mkdir cmake_build
+          mkdir examples/c/cmake_build
+          mkdir examples/cpp/cmake_build
+
+      - name: build flecs
+        working-directory: cmake_build
+        run: |
+          emcmake cmake -DFLECS_STRICT=ON ..
+          emcmake cmake --build . -j 4
+
+      - name: build c examples
+        working-directory: examples/c/cmake_build
+        run: |
+          emcmake cmake -DFLECS_STRICT=ON ..
+          emcmake cmake --build . -j 4
+
+      - name: build c++ examples
+        working-directory: examples/cpp/cmake_build
+        run: |
+          emcmake cmake -DFLECS_STRICT=ON ..
+          emcmake cmake --build . -j 4
+
   build-cmake-windows:
     needs: build-windows
     runs-on: windows-latest
@@ -634,6 +698,52 @@ jobs:
       - name: test c++
         run: bake run test/cpp -- -j 8
 
+  test-emscripten:
+    needs: build-emscripten
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    strategy:
+      fail-fast: false
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install compiler
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y emscripten
+
+      - name: install bake
+        run: |
+          git clone https://github.com/SanderMertens/bake
+          make -C bake/build-$(uname)
+          bake/bake setup
+          bake/bake setup --target em
+
+      - name: build flecs
+        run: bake --strict --target em
+
+      - name: test core
+        run: bake run test/core --target em -- -j 8
+
+      - name: test query
+        run: bake run test/query --target em -- -j 8
+
+      - name: test addons
+        run: bake run test/addons --target em -- -j 8
+
+      - name: test meta
+        run: bake run test/meta --target em -- -j 8
+
+      - name: test script
+        run: bake run test/script --target em -- -j 8
+
+      - name: test collections
+        run: bake run test/collections --target em -- -j 8
+
+      - name: test c++
+        run: bake run test/cpp --target em -- -j 8
+
   test-windows:
     needs: build-windows
     runs-on: windows-latest

distr/flecs.c

@@ -307,7 +307,7 @@ typedef struct ecs_table_diff_t {
 } ecs_table_diff_t;
 
 /** Edge linked list (used to keep track of incoming edges) */
-typedef struct ecs_graph_edge_hdr_t {
+typedef struct ECS_ALIGNAS(8) ecs_graph_edge_hdr_t {
     struct ecs_graph_edge_hdr_t *prev;
     struct ecs_graph_edge_hdr_t *next;
 } ecs_graph_edge_hdr_t;
@@ -745,7 +745,7 @@ typedef struct ecs_table_cache_list_t {
 } ecs_table_cache_list_t;
 
 /** Table cache */
-typedef struct ecs_table_cache_t {
+typedef struct ECS_ALIGNAS(8) ecs_table_cache_t {
     ecs_map_t index; /* <table_id, T*> */
     ecs_table_cache_list_t tables;
 } ecs_table_cache_t;
@@ -20553,9 +20553,9 @@ char* flecs_explorer_request(const char *method, char *request, char *body) {
     if (reply.code == 200) {
         return ecs_strbuf_get(&reply.body);
     } else {
-        char *body = ecs_strbuf_get(&reply.body);
-        if (body) {
-            return body;
+        char *reply_body = ecs_strbuf_get(&reply.body);
+        if (reply_body) {
+            return reply_body;
         } else {
             return flecs_asprintf(
                 "{\"error\": \"bad request\", \"status\": %d}", reply.code);

distr/flecs.h

@@ -883,6 +883,14 @@ typedef struct ecs_allocator_t ecs_allocator_t;
 #define ECS_ALIGNOF(T) ((int64_t)&((struct { char c; T d; } *)0)->d)
 #endif
 
+#if defined(ECS_TARGET_GNU)
+#define ECS_ALIGNAS(N) __attribute__((aligned(N)))
+#elif defined(ECS_TARGET_MSVC)
+#define ECS_ALIGNAS(N) __declspec(align(N))
+#else
+#define ECS_ALIGNAS(N)
+#endif
+
 #ifndef FLECS_NO_DEPRECATED_WARNINGS
 #if defined(ECS_TARGET_GNU)
 #define ECS_DEPRECATED(msg) __attribute__((deprecated(msg)))
@@ -3223,7 +3231,7 @@ struct ecs_record_t {
 };
 
 /** Header for table cache elements. */
-typedef struct ecs_table_cache_hdr_t {
+typedef struct ECS_ALIGNAS(8) ecs_table_cache_hdr_t {
     struct ecs_table_cache_t *cache;  /**< Table cache of element. Of type ecs_id_record_t* for component index elements. */
     ecs_table_t *table;               /**< Table associated with element. */
     struct ecs_table_cache_hdr_t *prev, *next; /**< Next/previous elements for id in table cache. */
@@ -14509,7 +14517,7 @@ typedef struct ecs_script_vars_t {
 } ecs_script_vars_t;
 
 /** Script object. */
-typedef struct ecs_script_t {
+typedef struct ECS_ALIGNAS(8) ecs_script_t {
     ecs_world_t *world;
     const char *name;
     const char *code;

include/flecs.h

@@ -527,7 +527,7 @@ struct ecs_record_t {
 };
 
 /** Header for table cache elements. */
-typedef struct ecs_table_cache_hdr_t {
+typedef struct ECS_ALIGNAS(8) ecs_table_cache_hdr_t {
     struct ecs_table_cache_t *cache;  /**< Table cache of element. Of type ecs_id_record_t* for component index elements. */
     ecs_table_t *table;               /**< Table associated with element. */
     struct ecs_table_cache_hdr_t *prev, *next; /**< Next/previous elements for id in table cache. */

include/flecs/addons/script.h

@@ -78,7 +78,7 @@ typedef struct ecs_script_vars_t {
 } ecs_script_vars_t;
 
 /** Script object. */
-typedef struct ecs_script_t {
+typedef struct ECS_ALIGNAS(8) ecs_script_t {
     ecs_world_t *world;
     const char *name;
     const char *code;

include/flecs/private/api_defines.h

@@ -258,6 +258,14 @@ typedef struct ecs_allocator_t ecs_allocator_t;
 #define ECS_ALIGNOF(T) ((int64_t)&((struct { char c; T d; } *)0)->d)
 #endif
 
+#if defined(ECS_TARGET_GNU)
+#define ECS_ALIGNAS(N) __attribute__((aligned(N)))
+#elif defined(ECS_TARGET_MSVC)
+#define ECS_ALIGNAS(N) __declspec(align(N))
+#else
+#define ECS_ALIGNAS(N)
+#endif
+
 #ifndef FLECS_NO_DEPRECATED_WARNINGS
 #if defined(ECS_TARGET_GNU)
 #define ECS_DEPRECATED(msg) __attribute__((deprecated(msg)))

src/addons/app.c

@@ -70,9 +70,9 @@ char* flecs_explorer_request(const char *method, char *request, char *body) {
     if (reply.code == 200) {
         return ecs_strbuf_get(&reply.body);
     } else {
-        char *body = ecs_strbuf_get(&reply.body);
-        if (body) {
-            return body;
+        char *reply_body = ecs_strbuf_get(&reply.body);
+        if (reply_body) {
+            return reply_body;
         } else {
             return flecs_asprintf(
                 "{\"error\": \"bad request\", \"status\": %d}", reply.code);

src/addons/script/ast.h

@@ -28,7 +28,7 @@ typedef enum ecs_script_node_kind_t {
     EcsAstFor
 } ecs_script_node_kind_t;
 
-typedef struct ecs_script_node_t {
+typedef struct ECS_ALIGNAS(8) ecs_script_node_t {
     ecs_script_node_kind_t kind;
     const char *pos;
 } ecs_script_node_t;

src/private_types.h

@@ -87,7 +87,7 @@ typedef struct ecs_table_cache_list_t {
 } ecs_table_cache_list_t;
 
 /** Table cache */
-typedef struct ecs_table_cache_t {
+typedef struct ECS_ALIGNAS(8) ecs_table_cache_t {
     ecs_map_t index; /* <table_id, T*> */
     ecs_table_cache_list_t tables;
 } ecs_table_cache_t;

src/storage/table_graph.h

@@ -27,7 +27,7 @@ typedef struct ecs_table_diff_t {
 } ecs_table_diff_t;
 
 /** Edge linked list (used to keep track of incoming edges) */
-typedef struct ecs_graph_edge_hdr_t {
+typedef struct ECS_ALIGNAS(8) ecs_graph_edge_hdr_t {
     struct ecs_graph_edge_hdr_t *prev;
     struct ecs_graph_edge_hdr_t *next;
 } ecs_graph_edge_hdr_t;