From b11471a9cde85bab63b0e6b4d0a4c3b43177e282 Mon Sep 17 00:00:00 2001
From: Ezekiel Warren <zaucy@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:19:55 -0700
Subject: [PATCH] feat: better cc dep support on Windows (#67)

---
 .editorconfig                          | 28 +++++++++++------------
 ecsact/private/ecsact_build_recipe.bzl | 31 ++++++++++++++++++--------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index a5bbb0b..250ffac 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,14 +1,14 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-[*.{cc,hh,cpp,hpp}]
-# matching .clang-format IndentWidth
-indent_size = 2
-
-[*.{bzl,bazel}]
-# matches output of buildifier
-indent_size = 4
-indent_style = space
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{cc,hh,cpp,hpp}]
+# matching .clang-format IndentWidth
+indent_size = 2
+
+[*.{bzl,bazel}]
+# matches output of buildifier
+indent_size = 4
+indent_style = space
diff --git a/ecsact/private/ecsact_build_recipe.bzl b/ecsact/private/ecsact_build_recipe.bzl
index 0fb84c8..385f206 100644
--- a/ecsact/private/ecsact_build_recipe.bzl
+++ b/ecsact/private/ecsact_build_recipe.bzl
@@ -64,31 +64,44 @@ def _ecsact_build_recipe(ctx):
         })
         recipe_data.append(info.plugin)
 
+    cc_dep_compilation_contexts = []
     for cc_dep in ctx.attr.cc_deps:
         cc_info = cc_dep[CcInfo]
+        cc_dep_compilation_contexts.append(cc_info.compilation_context)
 
-        for hdr in cc_info.compilation_context.headers.to_list():
+    if len(cc_dep_compilation_contexts) > 0:
+        cc_dep_compilation_context = cc_common.merge_compilation_contexts(compilation_contexts = cc_dep_compilation_contexts)
+
+        for hdr in cc_dep_compilation_context.headers.to_list():
             hdr_prefix = ""
 
-            for quote_inc in cc_info.compilation_context.quote_includes.to_list():
+            for quote_inc in cc_dep_compilation_context.quote_includes.to_list():
                 if hdr.path.startswith(quote_inc):
                     hdr_prefix = quote_inc
                     break
-            for sys_inc in cc_info.compilation_context.system_includes.to_list():
+            for sys_inc in cc_dep_compilation_context.system_includes.to_list():
                 if hdr.path.startswith(sys_inc):
                     hdr_prefix = sys_inc
                     break
+            for inc in cc_dep_compilation_context.includes.to_list():
+                if hdr.path.startswith(inc):
+                    hdr_prefix = inc
+                    break
 
+            hdr_prefix_base = ""
             if hdr_prefix:
                 hdr_prefix_base = hdr.path.removeprefix(hdr_prefix)
                 hdr_prefix_base_idx = hdr_prefix_base.rindex("/")
                 hdr_prefix_base = hdr_prefix_base[:hdr_prefix_base_idx]
-                sources.append({
-                    "path": hdr.path,
-                    "outdir": "include" + hdr_prefix_base,
-                    "relative_to_cwd": True,
-                })
-                recipe_data.append(hdr)
+            else:
+                hdr_prefix_base_idx = hdr.path.rindex("/")
+                hdr_prefix_base = "/" + hdr.path[:hdr_prefix_base_idx]
+            sources.append({
+                "path": hdr.path,
+                "outdir": "include" + hdr_prefix_base,
+                "relative_to_cwd": True,
+            })
+            recipe_data.append(hdr)
 
     recipe = {
         "name": ctx.attr.name,