From 38a0731461f470d38560f9766188f4f700987f3c Mon Sep 17 00:00:00 2001 From: Aaron Boxer Date: Thu, 24 Oct 2019 10:00:17 -0400 Subject: build: on Windows, use MSVC format for gst*, glib and gobject dlls Generated files were generated using 'ninja -C build update-code' except for libgstfft, which had to be updated manually (see issue #25). Note: with these changes, building on MS Windows will require the msvc compiler - mingw will no longer work. --- sources/generated/Gst.Net/Global.cs | 28 +++++++++++----------- sources/generated/Gst.Net/NetAddressMeta.cs | 2 +- sources/generated/Gst.Net/NetClientClock.cs | 4 ++-- sources/generated/Gst.Net/NetControlMessageMeta.cs | 2 +- sources/generated/Gst.Net/NetTimePacket.cs | 10 ++++---- sources/generated/Gst.Net/NetTimeProvider.cs | 6 ++--- sources/generated/Gst.Net/PtpClock.cs | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sources/generated/Gst.Net') diff --git a/sources/generated/Gst.Net/Global.cs b/sources/generated/Gst.Net/Global.cs index 231d381..3ef6d3b 100644 --- a/sources/generated/Gst.Net/Global.cs +++ b/sources/generated/Gst.Net/Global.cs @@ -11,7 +11,7 @@ namespace Gst.Net { #region Autogenerated code public partial class Global { - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_buffer_add_net_address_meta(IntPtr buffer, IntPtr addr); public static Gst.Net.NetAddressMeta BufferAddNetAddressMeta(Gst.Buffer buffer, GLib.SocketAddress addr) { @@ -20,7 +20,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_buffer_add_net_control_message_meta(IntPtr buffer, IntPtr message); public static Gst.Net.NetControlMessageMeta BufferAddNetControlMessageMeta(Gst.Buffer buffer, GLib.SocketControlMessage message) { @@ -29,7 +29,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_buffer_get_net_address_meta(IntPtr buffer); public static Gst.Net.NetAddressMeta BufferGetNetAddressMeta(Gst.Buffer buffer) { @@ -38,7 +38,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_address_meta_api_get_type(); public static GLib.GType NetAddressMetaApiGetType() { @@ -47,7 +47,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_address_meta_get_info(); public static Gst.MetaInfo NetAddressMetaGetInfo() { @@ -56,7 +56,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_control_message_meta_api_get_type(); public static GLib.GType NetControlMessageMetaApiGetType() { @@ -65,7 +65,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_control_message_meta_get_info(); public static Gst.MetaInfo NetControlMessageMetaGetInfo() { @@ -74,7 +74,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern unsafe IntPtr gst_net_time_packet_receive(IntPtr socket, out IntPtr src_address, out IntPtr error); public static unsafe Gst.Net.NetTimePacket NetTimePacketReceive(GLib.Socket socket, out GLib.SocketAddress src_address) { @@ -87,14 +87,14 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_ptp_deinit(); public static void PtpDeinit() { gst_ptp_deinit(); } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_ptp_init(ulong clock_id, IntPtr[] interfaces); public static bool PtpInit(ulong clock_id, string[] interfaces) { @@ -116,7 +116,7 @@ namespace Gst.Net { return PtpInit (clock_id, null); } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_ptp_is_initialized(); public static bool PtpIsInitialized() { @@ -125,7 +125,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool gst_ptp_is_supported(); public static bool PtpIsSupported() { @@ -134,7 +134,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern UIntPtr gst_ptp_statistics_callback_add(Gst.NetSharp.PtpStatisticsCallbackNative cb, IntPtr user_data, GLib.DestroyNotify destroy_data); public static ulong PtpStatisticsCallbackAdd(Gst.Net.PtpStatisticsCallback cb) { @@ -153,7 +153,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern void gst_ptp_statistics_callback_remove(UIntPtr id); public static void PtpStatisticsCallbackRemove(ulong id) { diff --git a/sources/generated/Gst.Net/NetAddressMeta.cs b/sources/generated/Gst.Net/NetAddressMeta.cs index e1148f8..551f28e 100644 --- a/sources/generated/Gst.Net/NetAddressMeta.cs +++ b/sources/generated/Gst.Net/NetAddressMeta.cs @@ -31,7 +31,7 @@ namespace Gst.Net { return (Gst.Net.NetAddressMeta) Marshal.PtrToStructure (raw, typeof (Gst.Net.NetAddressMeta)); } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_address_meta_get_info(); public static Gst.MetaInfo Info { diff --git a/sources/generated/Gst.Net/NetClientClock.cs b/sources/generated/Gst.Net/NetClientClock.cs index 0ea1203..ee08f64 100644 --- a/sources/generated/Gst.Net/NetClientClock.cs +++ b/sources/generated/Gst.Net/NetClientClock.cs @@ -13,7 +13,7 @@ namespace Gst.Net { public NetClientClock (IntPtr raw) : base(raw) {} - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_client_clock_new(IntPtr name, IntPtr remote_address, int remote_port, ulong base_time); public NetClientClock (string name, string remote_address, int remote_port, ulong base_time) : base (IntPtr.Zero) @@ -169,7 +169,7 @@ namespace Gst.Net { // End of the ABI representation. - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_client_clock_get_type(); public static new GLib.GType GType { diff --git a/sources/generated/Gst.Net/NetControlMessageMeta.cs b/sources/generated/Gst.Net/NetControlMessageMeta.cs index 5e4b0af..fdf5234 100644 --- a/sources/generated/Gst.Net/NetControlMessageMeta.cs +++ b/sources/generated/Gst.Net/NetControlMessageMeta.cs @@ -31,7 +31,7 @@ namespace Gst.Net { return (Gst.Net.NetControlMessageMeta) Marshal.PtrToStructure (raw, typeof (Gst.Net.NetControlMessageMeta)); } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_control_message_meta_get_info(); public static Gst.MetaInfo Info { diff --git a/sources/generated/Gst.Net/NetTimePacket.cs b/sources/generated/Gst.Net/NetTimePacket.cs index 81432fe..05b7270 100644 --- a/sources/generated/Gst.Net/NetTimePacket.cs +++ b/sources/generated/Gst.Net/NetTimePacket.cs @@ -23,7 +23,7 @@ namespace Gst.Net { return (Gst.Net.NetTimePacket) Marshal.PtrToStructure (raw, typeof (Gst.Net.NetTimePacket)); } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_time_packet_new(byte[] buffer); public static NetTimePacket New(byte[] buffer) @@ -32,7 +32,7 @@ namespace Gst.Net { return result; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_time_packet_get_type(); public static GLib.GType GType { @@ -43,7 +43,7 @@ namespace Gst.Net { } } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern unsafe bool gst_net_time_packet_send(IntPtr raw, IntPtr socket, IntPtr dest_address, out IntPtr error); public unsafe bool Send(GLib.Socket socket, GLib.SocketAddress dest_address) { @@ -58,7 +58,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern byte gst_net_time_packet_serialize(IntPtr raw); public byte Serialize() { @@ -71,7 +71,7 @@ namespace Gst.Net { return ret; } - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern unsafe IntPtr gst_net_time_packet_receive(IntPtr socket, out IntPtr src_address, out IntPtr error); public static unsafe Gst.Net.NetTimePacket Receive(GLib.Socket socket, out GLib.SocketAddress src_address) { diff --git a/sources/generated/Gst.Net/NetTimeProvider.cs b/sources/generated/Gst.Net/NetTimeProvider.cs index aeab528..cb6af8a 100644 --- a/sources/generated/Gst.Net/NetTimeProvider.cs +++ b/sources/generated/Gst.Net/NetTimeProvider.cs @@ -13,7 +13,7 @@ namespace Gst.Net { public NetTimeProvider (IntPtr raw) : base(raw) {} - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_time_provider_new(IntPtr clock, IntPtr address, int port); public NetTimeProvider (Gst.Clock clock, string address, int port) : base (IntPtr.Zero) @@ -121,7 +121,7 @@ namespace Gst.Net { // End of the ABI representation. - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_net_time_provider_get_type(); public static new GLib.GType GType { @@ -132,7 +132,7 @@ namespace Gst.Net { } } - [DllImport("libgio-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gio-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern bool g_initable_init(IntPtr raw, IntPtr cancellable, out IntPtr error); public bool Init(GLib.Cancellable cancellable) { diff --git a/sources/generated/Gst.Net/PtpClock.cs b/sources/generated/Gst.Net/PtpClock.cs index 272254c..fbfe5ec 100644 --- a/sources/generated/Gst.Net/PtpClock.cs +++ b/sources/generated/Gst.Net/PtpClock.cs @@ -13,7 +13,7 @@ namespace Gst.Net { public PtpClock (IntPtr raw) : base(raw) {} - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_ptp_clock_new(IntPtr name, uint domain); public PtpClock (string name, uint domain) : base (IntPtr.Zero) @@ -97,7 +97,7 @@ namespace Gst.Net { // End of the ABI representation. - [DllImport("libgstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] + [DllImport("gstnet-1.0-0.dll", CallingConvention = CallingConvention.Cdecl)] static extern IntPtr gst_ptp_clock_get_type(); public static new GLib.GType GType { -- cgit v1.2.3