Adds ImGui native binaries for win-arm64

This commit also rebuilds the x64 binaries to ensure both use the same source code after applying workaorund from dotnet/runtime#106471
vvvv · Aug 16, 2024 · a2c7cda · a2c7cda
1 parent 90c1ba5
commit a2c7cda
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/VL.Core.Skia/VL.Core.Skia.csproj b/VL.Core.Skia/VL.Core.Skia.csproj
@@ -19,21 +19,10 @@
     <ProjectReference Include="..\VL.Core\src\VL.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="ext\win-x64\*.dll">
-      <!-- For vvvv the file goes directly to the output - only way for native library lookup to find it (without having to write custom code) -->
-      <!--<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>-->
+    <None Include="runtimes\**">
       <Pack>true</Pack>
       <!-- As a package we can make use of nuget's asset system, it will make the proper entry in the *.deps.json file for the native library lookup to work -->
-      <PackagePath>runtimes\win-x64\native\%(Filename)%(Extension)</PackagePath>
-      <TargetPath>%(Filename)%(Extension)</TargetPath>
-    </None>
-    <None Include="ext\win-arm64\*.dll">
-      <!-- For vvvv the file goes directly to the output - only way for native library lookup to find it (without having to write custom code) -->
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Pack>true</Pack>
-      <!-- As a package we can make use of nuget's asset system, it will make the proper entry in the *.deps.json file for the native library lookup to work -->
-      <PackagePath>runtimes\win-x64\native\%(Filename)%(Extension)</PackagePath>
-      <TargetPath>%(Filename)%(Extension)</TargetPath>
+      <PackagePath>runtimes</PackagePath>
     </None>
   </ItemGroup>
 </Project>
diff --git a/VL.Core.Skia/ext/win-arm64/d3dcompiler_47.dll b/VL.Core.Skia/ext/win-arm64/d3dcompiler_47.dll
diff --git a/VL.Core.Skia/ext/win-arm64/libEGL.dll b/VL.Core.Skia/ext/win-arm64/libEGL.dll
diff --git a/VL.Core.Skia/ext/win-arm64/libGLESv2.dll b/VL.Core.Skia/ext/win-arm64/libGLESv2.dll
diff --git a/VL.Core.Skia/runtimes/win-arm64/native/d3dcompiler_47.dll b/VL.Core.Skia/runtimes/win-arm64/native/d3dcompiler_47.dll
diff --git a/VL.Core.Skia/runtimes/win-arm64/native/libEGL.dll b/VL.Core.Skia/runtimes/win-arm64/native/libEGL.dll
diff --git a/VL.Core.Skia/runtimes/win-arm64/native/libGLESv2.dll b/VL.Core.Skia/runtimes/win-arm64/native/libGLESv2.dll
diff --git a/VL.Core.Skia/ext/win-x64/d3dcompiler_47.dll → ...untimes/win-x64/native/d3dcompiler_47.dll b/VL.Core.Skia/ext/win-x64/d3dcompiler_47.dll → ...untimes/win-x64/native/d3dcompiler_47.dll
diff --git a/VL.Core.Skia/ext/win-x64/libEGL.dll → ...e.Skia/runtimes/win-x64/native/libEGL.dll b/VL.Core.Skia/ext/win-x64/libEGL.dll → ...e.Skia/runtimes/win-x64/native/libEGL.dll
diff --git a/VL.Core.Skia/ext/win-x64/libGLESv2.dll → ...kia/runtimes/win-x64/native/libGLESv2.dll b/VL.Core.Skia/ext/win-x64/libGLESv2.dll → ...kia/runtimes/win-x64/native/libGLESv2.dll
diff --git a/VL.ImGui/dependencies/ImGui.NET-nativebuild b/VL.ImGui/dependencies/ImGui.NET-nativebuild
diff --git a/VL.ImGui/runtimes/win-arm64/native/cimgui.dll b/VL.ImGui/runtimes/win-arm64/native/cimgui.dll
diff --git a/VL.ImGui/runtimes/win-x64/native/cimgui.dll b/VL.ImGui/runtimes/win-x64/native/cimgui.dll