ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-03 16:35:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve native lib referencing

Browse source
This commit is contained in:
cra0zy 2017-11-09 22:22:51 +01:00
parent 73f0fd3049
commit ee57c26d77
8 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CakeScripts/GAssembly.cs
View file

@ -85,10 +85,18 @@ public class GAssembly
{ {
var basedir = P.Combine("..", "..", Dir); var basedir = P.Combine("..", "..", Dir);
Cake.DeleteDirectory(P.Combine(basedir, "linux-x86"), new DeleteDirectorySettings { Recursive = true, Force = true }); if (Cake.DirectoryExists(P.Combine(basedir, "linux-x86")))
Cake.DeleteDirectory(P.Combine(basedir, "linux-x64"), new DeleteDirectorySettings { Recursive = true, Force = true }); Cake.DeleteDirectory(P.Combine(basedir, "linux-x86"), new DeleteDirectorySettings { Recursive = true, Force = true });
Cake.DeleteDirectory(P.Combine(basedir, "linux-arm"), new DeleteDirectorySettings { Recursive = true, Force = true }); Cake.CreateDirectory(P.Combine(basedir, "linux-x86"));
if (Cake.DirectoryExists(P.Combine(basedir, "linux-x64")))
Cake.DeleteDirectory(P.Combine(basedir, "linux-x64"), new DeleteDirectorySettings { Recursive = true, Force = true });
Cake.CreateDirectory(P.Combine(basedir, "linux-x64"));
if (Cake.DirectoryExists(P.Combine(basedir, "linux-arm")))
Cake.DeleteDirectory(P.Combine(basedir, "linux-arm"), new DeleteDirectorySettings { Recursive = true, Force = true });
Cake.CreateDirectory(P.Combine(basedir, "linux-arm"));
for (int i = 0; i < NativeDeps.Length; i += 2) for (int i = 0; i < NativeDeps.Length; i += 2)
{ {
// Generate x86 stubs // Generate x86 stubs

6
Source/Libs/AtkSharp/AtkSharp.csproj
View file

@ -20,8 +20,8 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libatk-1.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x64\libatk-1.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libatk-1.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
Source/Libs/CairoSharp/CairoSharp.csproj
View file

@ -15,8 +15,8 @@
<OutputPath>..\..\..\BuildOutput\Release</OutputPath> <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libcairo-2.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x64\libcairo-2.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libcairo-2.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
Source/Libs/GLibSharp/GLibSharp.csproj
View file

@ -15,14 +15,8 @@
<OutputPath>..\..\..\BuildOutput\Release</OutputPath> <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libglib-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x86\libgobject-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-x86\libgthread-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
<Content Include="linux-x64\libglib-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-x64\libgobject-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-x64\libgthread-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libglib-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
<Content Include="linux-arm\libgobject-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
<Content Include="linux-arm\libgthread-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>

9
Source/Libs/GdkSharp/GdkSharp.csproj
View file

@ -29,11 +29,8 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libgdk_pixbuf-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x86\libgdk-3-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-x64\libgdk_pixbuf-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
<Content Include="linux-x64\libgdk-3-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libgdk_pixbuf-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
<Content Include="linux-arm\libgdk-3-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
Source/Libs/GioSharp/GioSharp.csproj
View file

@ -20,8 +20,8 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libgio-2.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x64\libgio-2.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libgio-2.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
Source/Libs/GtkSharp/GtkSharp.csproj
View file

@ -37,8 +37,8 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libgtk-3-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x64\libgtk-3-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libgtk-3-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
Source/Libs/PangoSharp/PangoSharp.csproj
View file

@ -23,8 +23,8 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="linux-x86\libpango-1.0-0.dll.so" PackagePath="runtimes\linux-x86\native" Visible="false" /> <Content Include="linux-x86\*" PackagePath="runtimes\linux-x86\native" Visible="false" />
<Content Include="linux-x64\libpango-1.0-0.dll.so" PackagePath="runtimes\linux-x64\native" Visible="false" /> <Content Include="linux-x64\*" PackagePath="runtimes\linux-x64\native" Visible="false" />
<Content Include="linux-arm\libpango-1.0-0.dll.so" PackagePath="runtimes\linux-arm\native" Visible="false" /> <Content Include="linux-arm\*" PackagePath="runtimes\linux-arm\native" Visible="false" />
</ItemGroup> </ItemGroup>
</Project> </Project>