greepar/StaticLink.Avalonia
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Windows ANGLE static STL linkage

Browse Source
This commit is contained in:
geruipu committed 2026-06-21 01:04:00 +08:00
1 parent 4fb826fdb2
commit 8fea54c358
3 files changed
+11 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

NuGet/StaticGraphics/Shiroka.Avalonia.StaticLink.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<IncludeBuildOutput>false</IncludeBuildOutput> <IncludeBuildOutput>false</IncludeBuildOutput>
<SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking> <SuppressDependenciesWhenPacking>false</SuppressDependenciesWhenPacking>
<PackageId>Shiroka.Avalonia.StaticLink</PackageId> <PackageId>Shiroka.Avalonia.StaticLink</PackageId>
<Version>3.119.2-7151.4</Version> <Version>3.119.2-7151.5</Version>
<Authors>greepar</Authors> <Authors>greepar</Authors>
<Company>greepar</Company> <Company>greepar</Company>
<Description>Static SkiaSharp, HarfBuzzSharp, and ANGLE libraries for Avalonia NativeAOT single-file publishing.</Description> <Description>Static SkiaSharp, HarfBuzzSharp, and ANGLE libraries for Avalonia NativeAOT single-file publishing.</Description>
NuGet/StaticGraphics/buildTransitive/Shiroka.Avalonia.StaticLink.targets
+2
View File
@@ -20,6 +20,8 @@
<NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/SkiaSharp.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/SkiaSharp.lib')" /> <NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/SkiaSharp.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/SkiaSharp.lib')" />
<NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/libANGLE_static.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libANGLE_static.lib')" /> <NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/libANGLE_static.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libANGLE_static.lib')" />
<NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/libGLESv2_static.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libGLESv2_static.lib')" /> <NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/libGLESv2_static.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libGLESv2_static.lib')" />
<NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/libc++.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libc++.lib')" />
<NativeLibrary Include="$(_ShirokaAvaloniaStaticLinkNativeRoot)/libc++abi.lib" Condition="Exists('$(_ShirokaAvaloniaStaticLinkNativeRoot)/libc++abi.lib')" />
<LinkerArg Include="d3d9.lib;dxguid.lib" /> <LinkerArg Include="d3d9.lib;dxguid.lib" />
<LinkerArg Include="dxgi.lib" /> <LinkerArg Include="dxgi.lib" />
<LinkerArg Include="Gdi32.lib;User32.lib" /> <LinkerArg Include="Gdi32.lib;User32.lib" />
scripts/build-windows-static-graphics.ps1
+8
View File
@@ -255,6 +255,7 @@ is_debug = false
is_component_build = false is_component_build = false
is_clang = true is_clang = true
use_lld = false use_lld = false
use_custom_libcxx = false
use_thin_lto = false use_thin_lto = false
symbol_level = 0 symbol_level = 0
angle_build_tests = false angle_build_tests = false
@@ -267,6 +268,13 @@ angle_enable_wgpu = false
ninja -C $outDir -j $BuildJobs libANGLE_static libGLESv2_static ninja -C $outDir -j $BuildJobs libANGLE_static libGLESv2_static
Copy-FirstExisting (Join-Path $OutputDir "libANGLE_static.lib") @((Join-Path $outDir "libANGLE_static.lib"), (Join-Path $outDir "obj\libANGLE_static.lib"), (Join-Path $outDir "obj\libANGLE_static\libANGLE_static.lib")) Copy-FirstExisting (Join-Path $OutputDir "libANGLE_static.lib") @((Join-Path $outDir "libANGLE_static.lib"), (Join-Path $outDir "obj\libANGLE_static.lib"), (Join-Path $outDir "obj\libANGLE_static\libANGLE_static.lib"))
Copy-FirstExisting (Join-Path $OutputDir "libGLESv2_static.lib") @((Join-Path $outDir "libGLESv2_static.lib"), (Join-Path $outDir "obj\libGLESv2_static.lib"), (Join-Path $outDir "obj\libGLESv2_static\libGLESv2_static.lib")) Copy-FirstExisting (Join-Path $OutputDir "libGLESv2_static.lib") @((Join-Path $outDir "libGLESv2_static.lib"), (Join-Path $outDir "obj\libGLESv2_static.lib"), (Join-Path $outDir "obj\libGLESv2_static\libGLESv2_static.lib"))
foreach ($libcxxName in @("libc++.lib", "libc++abi.lib")) {
$libcxxPath = Join-Path $src "third_party\llvm-build\Release+Asserts\lib\$libcxxName"
if (Test-Path $libcxxPath) {
Copy-Item $libcxxPath (Join-Path $OutputDir $libcxxName) -Force
Write-Host "Wrote $(Join-Path $OutputDir $libcxxName)"
}
}
} finally { } finally {
Pop-Location Pop-Location
} }