Commit fbd21c45 authored by Mike Wey's avatar Mike Wey
Browse files

Add support for loading the wingkt and vcpkg libraries.

Currently librsvg is missing from vcpkg, causing gtkd to fail because of a missing library.

See Also: #270
parent 68b05538
......@@ -29,7 +29,7 @@ import gst.app.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GSTAPP = ["libgstapp-1.0-0.dll"];
static immutable LIBRARY_GSTAPP = ["libgstapp-1.0-0.dll;gstapp-1.0-0.dll;gstapp-1.dll"];
else version (OSX)
static immutable LIBRARY_GSTAPP = ["libgstapp-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gst.base.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GSTBASE = ["libgstbase-1.0-0.dll"];
static immutable LIBRARY_GSTBASE = ["libgstbase-1.0-0.dll;gstbase-1.0-0.dll;gstbase-1.dll"];
else version (OSX)
static immutable LIBRARY_GSTBASE = ["libgstbase-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gst.mpegts.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GSTMPEGTS = ["libgstmpegts-1.0-0.dll"];
static immutable LIBRARY_GSTMPEGTS = ["libgstmpegts-1.0-0.dll;gstmpegts-1.0-0.dll;gstmpegts-1.dll"];
else version (OSX)
static immutable LIBRARY_GSTMPEGTS = ["libgstmpegts-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gstinterfaces.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GSTINTERFACES = ["libgstvideo-1.0-0.dll"];
static immutable LIBRARY_GSTINTERFACES = ["libgstvideo-1.0-0.dll;gstvideo-1.0-0.dll;gstvideo-1.dll"];
else version (OSX)
static immutable LIBRARY_GSTINTERFACES = ["libgstvideo-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gstreamer.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GSTREAMER = ["libgstreamer-1.0-0.dll"];
static immutable LIBRARY_GSTREAMER = ["libgstreamer-1.0-0.dll;gstreamer-1.0-0.dll;gstreamer-1.dll"];
else version (OSX)
static immutable LIBRARY_GSTREAMER = ["libgstreamer-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import atk.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_ATK = ["libatk-1.0-0.dll"];
static immutable LIBRARY_ATK = ["libatk-1.0-0.dll;atk-1.0-0.dll;atk-1.dll"];
else version (OSX)
static immutable LIBRARY_ATK = ["libatk-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ private import cairo.c.types;
private import gtkd.Loader;
version (Windows)
static immutable LIBRARY_CAIRO = ["libcairo-2.dll"];
static immutable LIBRARY_CAIRO = ["libcairo-2.dll;cairo.dll"];
else version (OSX)
static immutable LIBRARY_CAIRO = ["libcairo.dylib"];
else
......
......@@ -30,7 +30,7 @@ import cairo.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GDK = ["libgdk-3-0.dll"];
static immutable LIBRARY_GDK = ["libgdk-3-0.dll;gdk-3-3.0.dll;gdk-3.dll"];
else version (OSX)
static immutable LIBRARY_GDK = ["libgdk-3.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gdkpixbuf.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GDKPIXBUF = ["libgdk_pixbuf-2.0-0.dll"];
static immutable LIBRARY_GDKPIXBUF = ["libgdk_pixbuf-2.0-0.dll;gdk_pixbuf-2.0-0.dll;gdk_pixbuf-2.dll"];
else version (OSX)
static immutable LIBRARY_GDKPIXBUF = ["libgdk_pixbuf-2.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gio.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GIO = ["libgio-2.0-0.dll"];
static immutable LIBRARY_GIO = ["libgio-2.0-0.dll;gio-2.0-0.dll;gio-2.dll"];
else version (OSX)
static immutable LIBRARY_GIO = ["libgio-2.0.0.dylib"];
else
......
......@@ -30,7 +30,7 @@ import gobject.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GLIB = ["libglib-2.0-0.dll", "libgmodule-2.0-0.dll", "libgobject-2.0-0.dll"];
static immutable LIBRARY_GLIB = ["libglib-2.0-0.dll;g-2.0-0.dll;g-2.dll", "libgmodule-2.0-0.dll;gmodule-2.0-0.dll;gmodule-2.dll", "libgobject-2.0-0.dll;gobject-2.0-0.dll;gobject-2.dll"];
else version (OSX)
static immutable LIBRARY_GLIB = ["libglib-2.0.0.dylib", "libgmodule-2.0.0.dylib", "libgobject-2.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import gobject.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_GOBJECT = ["libgobject-2.0-0.dll"];
static immutable LIBRARY_GOBJECT = ["libgobject-2.0-0.dll;gobject-2.0-0.dll;gobject-2.dll"];
else version (OSX)
static immutable LIBRARY_GOBJECT = ["libgobject-2.0.0.dylib"];
else
......
......@@ -57,10 +57,10 @@ public interface CellAccessibleParentIF{
public void expandCollapse(CellAccessible cell);
/** */
public void getCellArea(CellAccessible cell, GdkRectangle* cellRect);
public void getCellArea(CellAccessible cell, out GdkRectangle cellRect);
/** */
public void getCellExtents(CellAccessible cell, int* x, int* y, int* width, int* height, AtkCoordType coordType);
public void getCellExtents(CellAccessible cell, out int x, out int y, out int width, out int height, AtkCoordType coordType);
/** */
public void getCellPosition(CellAccessible cell, out int row, out int column);
......
......@@ -63,15 +63,15 @@ public template CellAccessibleParentT(TStruct)
}
/** */
public void getCellArea(CellAccessible cell, GdkRectangle* cellRect)
public void getCellArea(CellAccessible cell, out GdkRectangle cellRect)
{
gtk_cell_accessible_parent_get_cell_area(getCellAccessibleParentStruct(), (cell is null) ? null : cell.getCellAccessibleStruct(), cellRect);
gtk_cell_accessible_parent_get_cell_area(getCellAccessibleParentStruct(), (cell is null) ? null : cell.getCellAccessibleStruct(), &cellRect);
}
/** */
public void getCellExtents(CellAccessible cell, int* x, int* y, int* width, int* height, AtkCoordType coordType)
public void getCellExtents(CellAccessible cell, out int x, out int y, out int width, out int height, AtkCoordType coordType)
{
gtk_cell_accessible_parent_get_cell_extents(getCellAccessibleParentStruct(), (cell is null) ? null : cell.getCellAccessibleStruct(), x, y, width, height, coordType);
gtk_cell_accessible_parent_get_cell_extents(getCellAccessibleParentStruct(), (cell is null) ? null : cell.getCellAccessibleStruct(), &x, &y, &width, &height, coordType);
}
/** */
......
......@@ -29,11 +29,11 @@ import gtk.c.types;
import gtkd.Loader;
 
version (Windows)
static immutable LIBRARY_GTK = ["libgdk-3-0.dll", "libgtk-3-0.dll"];
static immutable LIBRARY_GTK = ["libgtk-3-0.dll;gtk-3-3.0.dll;gtk-3.dll"];
else version (OSX)
static immutable LIBRARY_GTK = ["libgdk-3.0.dylib", "libgtk-3.0.dylib"];
static immutable LIBRARY_GTK = ["libgtk-3.0.dylib"];
else
static immutable LIBRARY_GTK = ["libgdk-3.so.0", "libgtk-3.so.0"];
static immutable LIBRARY_GTK = ["libgtk-3.so.0"];
 
shared static this()
{
......@@ -11596,6 +11596,74 @@ struct GtkWindowGroupPrivate;
struct GtkWindowPrivate;
/**
* Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-Gtk-MountOperationHandler.top_of_page">org.Gtk.MountOperationHandler</link>.
*/
struct _GtkMountOperationHandler;
/**
* Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-Gtk-MountOperationHandler.top_of_page">org.Gtk.MountOperationHandler</link>.
*/
struct _GtkMountOperationHandlerIface
{
/**
* The parent interface.
*/
GTypeInterface parentIface;
/** */
extern(C) int function(_GtkMountOperationHandler* object, GDBusMethodInvocation* invocation, const(char)* argId, const(char)* argMessage, const(char)* argIconName, const(char)* argDefaultUser, const(char)* argDefaultDomain, uint argFlags) handleAskPassword;
/** */
extern(C) int function(_GtkMountOperationHandler* object, GDBusMethodInvocation* invocation, const(char)* argId, const(char)* argMessage, const(char)* argIconName, const(char)* argChoices) handleAskQuestion;
/** */
extern(C) int function(_GtkMountOperationHandler* object, GDBusMethodInvocation* invocation) handleClose;
/** */
extern(C) int function(_GtkMountOperationHandler* object, GDBusMethodInvocation* invocation, const(char)* argId, const(char)* argMessage, const(char)* argIconName, GVariant* argApplicationPids, const(char)* argChoices) handleShowProcesses;
}
/**
* The #_GtkMountOperationHandlerProxy structure contains only private data and should only be accessed using the provided API.
*/
struct _GtkMountOperationHandlerProxy
{
GDBusProxy parentInstance;
_GtkMountOperationHandlerProxyPrivate* priv;
}
/**
* Class structure for #_GtkMountOperationHandlerProxy.
*/
struct _GtkMountOperationHandlerProxyClass
{
/**
* The parent class.
*/
GDBusProxyClass parentClass;
}
struct _GtkMountOperationHandlerProxyPrivate;
/**
* The #_GtkMountOperationHandlerSkeleton structure contains only private data and should only be accessed using the provided API.
*/
struct _GtkMountOperationHandlerSkeleton
{
GDBusInterfaceSkeleton parentInstance;
_GtkMountOperationHandlerSkeletonPrivate* priv;
}
/**
* Class structure for #_GtkMountOperationHandlerSkeleton.
*/
struct _GtkMountOperationHandlerSkeletonClass
{
/**
* The parent class.
*/
GDBusInterfaceSkeletonClass parentClass;
}
struct _GtkMountOperationHandlerSkeletonPrivate;
/** */
public alias extern(C) int function(GtkAccelGroup* accelGroup, GObject* acceleratable, uint keyval, GdkModifierType modifier) GtkAccelGroupActivate;
......
......@@ -346,15 +346,18 @@ version(Windows)
import std.process;
import std.file;
foreach (path; splitter(environment.get("PATH"), ';'))
foreach ( lib; ["libgtk-3-0.dll", "gtk-3-3.0.dll", "gtk-3.dll"] )
{
string dllPath = buildNormalizedPath(path, "libgtk-3-0.dll");
foreach (path; splitter(environment.get("PATH"), ';'))
{
string dllPath = buildNormalizedPath(path, lib);
if ( !exists(dllPath) )
continue;
if ( !exists(dllPath) )
continue;
if ( checkArchitecture(dllPath) )
return path;
if ( checkArchitecture(dllPath) )
return path;
}
}
return null;
......
......@@ -30,7 +30,7 @@ import cairo.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_PANGO = ["libpango-1.0-0.dll", "libpangocairo-1.0-0.dll"];
static immutable LIBRARY_PANGO = ["libpango-1.0-0.dll;pango-1.0-0.dll;pango-1.dll", "libpangocairo-1.0-0.dll;pangocairo-1.0-0.dll;pangocairo-1.dll"];
else version (OSX)
static immutable LIBRARY_PANGO = ["libpango-1.0.0.dylib", "libpangocairo-1.0.0.dylib"];
else
......
......@@ -29,7 +29,7 @@ import rsvg.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_RSVG = ["librsvg-2-2.dll"];
static immutable LIBRARY_RSVG = ["librsvg-2-2.dll;rsvg-2-2.2.dll;rsvg-2.dll"];
else version (OSX)
static immutable LIBRARY_RSVG = ["librsvg-2.2.dylib"];
else
......
......@@ -29,7 +29,7 @@ import peas.c.types;
import gtkd.Loader;
version (Windows)
static immutable LIBRARY_PEAS = ["libpeas-1.0-0.dll", "gtk-1.0-0.dll"];
static immutable LIBRARY_PEAS = ["libpeas-1.0-0.dll;peas-1.0-0.dll;peas-1.dll", "gtk-1.0-0.dll;gtk-1.0-0.dll;gtk-1.dll"];
else version (OSX)
static immutable LIBRARY_PEAS = ["libpeas-1.0.0.dylib", "gtk-1.0.0.dylib"];
else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment