From 88fe47a63b0b8179ec0c205b50d913241342754a Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Sat, 26 Oct 2024 21:19:22 +0200
Subject: [PATCH] Disable automatic NativeAOT linking

Currently `BindgenInternal.LoadDLLSymbol` do not supports statically linked
libraries so for now disable automatic linking and add comment with explanation.

Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
---
 README.md                                                  | 2 +-
 .../buildTransitive/Flecs.NET.Native.props                 | 4 +++-
 .../buildTransitive/Flecs.NET.Native.targets               | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index df46773..8d89288 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ public record struct Velocity(float X, float Y);
 
 **Flecs.NET.Native - Precompiled native libraries**
 - Provides both shared and static libraries for Windows, MacOS, Linux, iOS, and WASM
-- Static libraries are automatically linked for NativeAOT builds (`$(FlecsStaticPath)` available for manual linking for other targets)
+- `$(FlecsStaticLibrary)` is provided for static linking in MSBuild projects
 - Packaged with Zig for dependency free cross-compilation everywhere
 
 ## NuGet
diff --git a/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.props b/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.props
index 9d48ea5..ada0ee4 100644
--- a/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.props
+++ b/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
-    <FlecsStaticPath>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)../static/$(RuntimeIdentifier)/native/'))</FlecsStaticPath>
     <IsWindowsRuntime Condition="'$(RuntimeIdentifier)' != '' and $(RuntimeIdentifier.StartsWith('win-'))">true</IsWindowsRuntime>
+    <FlecsStaticPath>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)../static/$(RuntimeIdentifier)/native/'))</FlecsStaticPath>
+    <FlecsStaticLibrary Condition="'$(IsWindowsRuntime)' == 'true'">$(FlecsStaticPath)flecs.lib</FlecsStaticLibrary>
+    <FlecsStaticLibrary Condition="'$(IsWindowsRuntime)' != 'true'">$(FlecsStaticPath)libflecs.a</FlecsStaticLibrary>
   </PropertyGroup>
 </Project>
diff --git a/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.targets b/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.targets
index 12871f5..75666b1 100644
--- a/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.targets
+++ b/src/Flecs.NET.Native/buildTransitive/Flecs.NET.Native.targets
@@ -1,7 +1,8 @@
 <Project>
-  <ItemGroup Condition="'$(PublishAot)' == 'true'">
+  <!-- FIXME: BindgenInternal.LoadDLLSymbol do not supports static linking
+  <ItemGroup Condition="'$(PublishAot)' == 'true' and Exists('$(FlecsStaticLibrary)')">
     <DirectPInvoke Include="flecs"/>
-    <NativeLibrary Condition="'$(IsWindowsRuntime)' == 'true'" Include="$(FlecsStaticPath)flecs.lib"/>
-    <NativeLibrary Condition="'$(IsWindowsRuntime)' != 'true'" Include="$(FlecsStaticPath)libflecs.a"/>
+    <NativeLibrary Include="$(FlecsStaticLibrary)"/>
   </ItemGroup>
+  -->
 </Project>