Skip to content

Commit ce1aea2

Browse files
PerkseyPerksey
committed
Integrate SilkTouch runtime config + add iOS back to TriangleNET6
1 parent 527ab4f commit ce1aea2

25 files changed

+502
-78
lines changed

‎build/props/bindings.props

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@
1414
</PropertyGroup>
1515
<ItemGroup Condition="'@(SilkPInvokeOverride)' != ''">
1616
<SilkGeneratedILLinkLine Include="&lt;linker&gt;" />
17-
<SilkGeneratedILLinkLine Include=" &lt;assembly fullname=&quot;$(PackageId)&quot;&gt;" />
18-
<SilkGeneratedILLinkLine Include=" &lt;type fullname=&quot;SilkTouchRuntimeConfiguration&quot;&gt;" />
19-
<SilkGeneratedILLinkLine Include=" &lt;method signature=&quot;System.Boolean get_HasLinkTimeSubstitutions&quot; body=&quot;stub&quot; value=&quot;true&quot;&gt;" />
20-
<SilkGeneratedILLinkLine Include=" &lt;method signature=&quot;System.Boolean get_$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', ''))PInvokeOverride%(SilkPInvokeOverride.Identity)&quot; body=&quot;stub&quot; value=&quot;true&quot; feature=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; featurevalue=&quot;true&quot;&gt;" />
21-
<SilkGeneratedILLinkLine Include=" &lt;method signature=&quot;System.Boolean get_$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', ''))PInvokeOverride%(SilkPInvokeOverride.Identity)&quot; body=&quot;stub&quot; value=&quot;false&quot; feature=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; featurevalue=&quot;false&quot;&gt;" />
22-
<SilkGeneratedILLinkLine Include=" &lt;/type&gt;" />
23-
<SilkGeneratedILLinkLine Include=" &lt;/assembly&gt;" />
17+
<SilkGeneratedILLinkLine Include="&lt;assembly fullname=&quot;$(PackageId)&quot;&gt;" />
18+
<SilkGeneratedILLinkLine Include="&lt;type fullname=&quot;SilkTouchRuntimeConfiguration&quot;&gt;" />
19+
<SilkGeneratedILLinkLine Include="&lt;method signature=&quot;System.Boolean get_HasLinkTimeSubstitutions&quot; body=&quot;stub&quot; value=&quot;true&quot; /&gt;" />
20+
<SilkGeneratedILLinkLine Include="&lt;method signature=&quot;System.Boolean get_$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', ''))PInvokeOverride%(SilkPInvokeOverride.Identity)&quot; body=&quot;stub&quot; value=&quot;true&quot; feature=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; featurevalue=&quot;true&quot; /&gt;" />
21+
<SilkGeneratedILLinkLine Include="&lt;method signature=&quot;System.Boolean get_$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', ''))PInvokeOverride%(SilkPInvokeOverride.Identity)&quot; body=&quot;stub&quot; value=&quot;false&quot; feature=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; featurevalue=&quot;false&quot; /&gt;" />
22+
<SilkGeneratedILLinkLine Include="&lt;/type&gt;" />
23+
<SilkGeneratedILLinkLine Include="&lt;/assembly&gt;" />
2424
<SilkGeneratedILLinkLine Include="&lt;/linker&gt;" />
2525
<SilkGeneratedTargetLine Include="&lt;Project&gt;" />
26-
<SilkGeneratedTargetLine Include=" &lt;ItemGroup&gt;" />
27-
<SilkGeneratedTargetLine Include=" &lt;RuntimeHostConfigurationOption Condition=&quot;%(SilkPInvokeOverride.DownstreamCondition)&quot; Include=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; Value=&quot;true&quot; Trim=&quot;true&quot;&gt;" />
28-
<SilkGeneratedTargetLine Include=" &lt;RuntimeHostConfigurationOption Condition=&quot;!(%(SilkPInvokeOverride.DownstreamCondition))&quot; Include=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; Value=&quot;false&quot; Trim=&quot;true&quot;&gt;" />
29-
<SilkGeneratedTargetLine Include=" &lt;/ItemGroup&gt;" />
26+
<SilkGeneratedTargetLine Include="&lt;ItemGroup&gt;" />
27+
<SilkGeneratedTargetLine Include="&lt;RuntimeHostConfigurationOption Condition=&quot;('%24(SilkEnableStaticLinking)' == 'true') or %24([System.String]::Copy('%40(SilkInternalPInvoke)').ToLower().Contains('%(SilkPInvokeOverride.SilkClass)')) or %(SilkPInvokeOverride.DownstreamCondition)&quot; Include=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; Value=&quot;true&quot; Trim=&quot;true&quot; /&gt;" />
28+
<SilkGeneratedTargetLine Include="&lt;RuntimeHostConfigurationOption Condition=&quot;!(('%24(SilkEnableStaticLinking)' == 'true') or %24([System.String]::Copy('%40(SilkInternalPInvoke)').ToLower().Contains('%(SilkPInvokeOverride.SilkClass)')) or %(SilkPInvokeOverride.DownstreamCondition))&quot; Include=&quot;$([System.String]::Copy('%(SilkPInvokeOverride.SilkClass)').Replace('.', '_').ToUpper())_ENABLE_PINVOKE_OVERRIDE_%(SilkPInvokeOverride.Identity)&quot; Value=&quot;false&quot; Trim=&quot;true&quot; /&gt;" />
29+
<SilkGeneratedTargetLine Include="&lt;/ItemGroup&gt;" />
3030
<SilkGeneratedTargetLine Include="&lt;/Project&gt;" />
3131
<SilkGeneratedILLinkFile Include="$(SilkGeneratedILLinkPath)" />
3232
<SilkGeneratedTargetFile Include="$(SilkGeneratedTargetPath)" />

‎build/props/common.props

+6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
Silk.NET is a high-speed, advanced library, providing bindings to popular low-level APIs such as OpenGL, OpenCL, OpenAL, OpenXR, GLFW, SDL, Vulkan, Assimp, and DirectX.
2626
</Description>
2727
</PropertyGroup>
28+
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6')) or $(TargetFramework.StartsWith('net7')) or $(TargetFramework.StartsWith('net8'))">
29+
<IsTrimmable>true</IsTrimmable>
30+
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
31+
<EnableAotAnalyzer>true</EnableAotAnalyzer>
32+
<EnableSingleFileAnalyzer>true</EnableSingleFileAnalyzer>
33+
</PropertyGroup>
2834
<!-- Date/time based versioning (mainly used by natives) -->
2935
<Target Name="SilkAddDateTime" Condition="'$(SilkGitDirForVersion)' != '' and Exists('$(SilkGitDirForVersion)/.git')">
3036
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">

0 commit comments

Comments
 (0)