Add .dll to the name of the libs because on Windows .Net Core does not try to guess the name

This commit is contained in:
cra0zy 2017-10-30 00:49:23 +01:00
parent ac7ea69ce8
commit 4bc1fb5101
52 changed files with 56 additions and 56 deletions

View file

@ -13,43 +13,43 @@ class Settings
new GAssembly("GLibSharp")
{
NativeDeps = new[] {
"libglib-2.0.so.0", "libglib-2.0-0",
"libgobject-2.0.so.0", "libgobject-2.0-0",
"libgthread-2.0.so.0", "libgthread-2.0-0"
"libglib-2.0.so.0", "libglib-2.0-0.dll",
"libgobject-2.0.so.0", "libgobject-2.0-0.dll",
"libgthread-2.0.so.0", "libgthread-2.0-0.dll"
}
},
new GAssembly("GioSharp")
{
Deps = new[] { "GLibSharp" },
NativeDeps = new[] { "libgio-2.0.so.0", "libgio-2.0-0" }
NativeDeps = new[] { "libgio-2.0.so.0", "libgio-2.0-0.dll" }
},
new GAssembly("AtkSharp")
{
Deps = new[] { "GLibSharp" },
NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0" },
NativeDeps = new[] { "libatk-1.0.so.0", "libatk-1.0-0.dll" },
ExtraArgs = "--abi-cs-usings=Atk,GLib"
},
new GAssembly("CairoSharp")
{
NativeDeps = new[] { "libcairo.so.2", "libcairo-2" }
NativeDeps = new[] { "libcairo.so.2", "libcairo-2.dll" }
},
new GAssembly("PangoSharp")
{
Deps = new[] { "GLibSharp", "CairoSharp" },
NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0" }
NativeDeps = new[] { "libpango-1.0.so.0", "libpango-1.0-0.dll" }
},
new GAssembly("GdkSharp")
{
Deps = new[] { "GLibSharp", "GioSharp", "CairoSharp", "PangoSharp" },
NativeDeps = new[] {
"libgdk-3.so.0", "libgdk-3-0",
"libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0"
"libgdk-3.so.0", "libgdk-3-0.dll",
"libgdk_pixbuf-2.0.so.0", "libgdk_pixbuf-2.0-0.dll"
}
},
new GAssembly("GtkSharp")
{
Deps = new[] { "GLibSharp", "GioSharp", "AtkSharp", "CairoSharp", "PangoSharp", "GdkSharp" },
NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0" },
NativeDeps = new[] { "libgtk-3.so.0", "libgtk-3-0.dll" },
ExtraArgs = "--abi-cs-usings=Gtk,GLib"
}
};

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Atk" library="libatk-1.0-0">
<namespace name="Atk" library="libatk-1.0-0.dll">
<enum name="CoordType" cname="AtkCoordType" gtype="atk_coord_type_get_type" type="enum">
<member cname="ATK_XY_SCREEN" name="Screen" />
<member cname="ATK_XY_WINDOW" name="Window" />

View file

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

View file

@ -28,7 +28,7 @@ namespace Atk {
public partial class Global {
[DllImport ("libatk-1.0-0", CallingConvention = CallingConvention.Cdecl)]
[DllImport ("libatk-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern uint atk_add_global_event_listener (GLib.Signal.EmissionHookNative hook, IntPtr event_type);
public static uint AddGlobalEventListener (GLib.Signal.EmissionHook hook, string event_type)

View file

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

View file

@ -41,7 +41,7 @@ namespace Cairo
internal static class NativeMethods
{
const string cairo = "libcairo-2";
const string cairo = "libcairo-2.dll";
[DllImport (cairo, CallingConvention=CallingConvention.Cdecl)]
internal static extern void cairo_append_path (IntPtr cr, IntPtr path);

View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<api>
<namespace name="GLib" library="libglib-2.0-0">
<namespace name="GLib" library="libglib-2.0-0.dll">
<enum name="ConnectFlags" cname="GConnectFlags" type="flags" />
<enum name="IOCondition" cname="GIOCondition" type="enum" />
<enum name="SeekType" cname="GSeekType" type="enum" />

View file

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

View file

@ -31,8 +31,8 @@ namespace GLib {
//this is a static class
private Global () {}
internal const string GLibNativeDll = "libglib-2.0-0";
internal const string GObjectNativeDll = "libgobject-2.0-0";
internal const string GLibNativeDll = "libglib-2.0-0.dll";
internal const string GObjectNativeDll = "libgobject-2.0-0.dll";
internal static bool IsWindowsPlatform {
get {

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Gdk" library="libgdk-3-0">
<namespace name="Gdk" library="libgdk-3-0.dll">
<enum name="AnchorHints" cname="GdkAnchorHints" gtype="gdk_anchor_hints_get_type" type="flags">
<member cname="GDK_ANCHOR_FLIP_X" name="FlipX" value="1 &lt;&lt; 0" />
<member cname="GDK_ANCHOR_FLIP_Y" name="FlipY" value="1 &lt;&lt; 1" />
@ -5301,7 +5301,7 @@
</method>
</class>
</namespace>
<namespace name="Gdk" library="libgdk_pixbuf-2.0-0">
<namespace name="Gdk" library="libgdk_pixbuf-2.0-0.dll">
<enum name="Colorspace" cname="GdkColorspace" gtype="gdk_colorspace_get_type" type="enum">
<member cname="GDK_COLORSPACE_RGB" name="Rgb" />
</enum>

View file

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

View file

@ -26,7 +26,7 @@ namespace Gdk {
public partial class Global {
internal const string GdkNativeDll = "libgdk-3-0";
internal const string GdkNativeDll = "libgdk-3-0.dll";
[DllImport (Global.GdkNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr gdk_list_visuals ();

View file

@ -24,6 +24,6 @@ namespace GLib
{
public partial class GioGlobal
{
internal const string GioNativeDll = "libgio-2.0-0";
internal const string GioNativeDll = "libgio-2.0-0.dll";
}
}

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="G" library="libgio-2.0-0">
<namespace name="G" library="libgio-2.0-0.dll">
<enum name="AppInfoCreateFlags" cname="GAppInfoCreateFlags" gtype="g_app_info_create_flags_get_type" type="flags">
<member cname="G_APP_INFO_CREATE_NONE" name="None" />
<member cname="G_APP_INFO_CREATE_NEEDS_TERMINAL" name="NeedsTerminal" value="1 &lt;&lt; 0" />

View file

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

View file

@ -20,7 +20,7 @@ namespace Gtk {
public partial class Global {
internal const string GtkNativeDll = "libgtk-3-0";
internal const string GtkNativeDll = "libgtk-3-0.dll";
public static bool ShowUri (string uri)
{

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Gtk" library="libgtk-3-0">
<namespace name="Gtk" library="libgtk-3-0.dll">
<enum name="AccelFlags" cname="GtkAccelFlags" gtype="gtk_accel_flags_get_type" type="flags">
<member cname="GTK_ACCEL_VISIBLE" name="Visible" value="1 &lt;&lt; 0" />
<member cname="GTK_ACCEL_LOCKED" name="Locked" value="1 &lt;&lt; 1" />

View file

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

View file

@ -25,7 +25,7 @@ namespace Pango {
public partial class Global {
internal const string PangoNativeDll = "libpango-1.0-0";
internal const string PangoNativeDll = "libpango-1.0-0.dll";
[DllImport (PangoNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool pango_scan_int(IntPtr pos, out int out_param);

View file

@ -6,7 +6,7 @@
Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-->
<namespace name="Pango" library="libpango-1.0-0">
<namespace name="Pango" library="libpango-1.0-0.dll">
<enum name="Alignment" cname="PangoAlignment" gtype="pango_alignment_get_type" type="enum">
<member cname="PANGO_ALIGN_LEFT" name="Left" />
<member cname="PANGO_ALIGN_CENTER" name="Center" />

View file

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

View file

@ -18,7 +18,7 @@ Task("Init")
.Does(() =>
{
// Assign some common properties
msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.7");
msbuildsettings = msbuildsettings.WithProperty("Version", "3.22.24.9");
msbuildsettings = msbuildsettings.WithProperty("Authors", "'GtkSharp Contributors'");
msbuildsettings = msbuildsettings.WithProperty("PackageLicenseUrl", "'https://github.com/cra0zy/GtkSharp/blob/cakecore/LICENSE'");