diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2009-06-13 02:24:26 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2009-06-13 02:24:26 +0400 |
| commit | 48747372cdcb4426745850909617b53a1b9a86c4 (patch) | |
| tree | 918ffe9605ae51c181116287abd6dd9b0b4ee473 /gsharp | |
| parent | 4e83ab598052ce9491653d959edcaee556a091f2 (diff) | |
2008-12-15 Miguel de Icaza <miguel@novell.com>
* configure.in: Detect the proper LIB_PREFIX and LIB_SUFIX to fix
the crasher for gsharp when trying to Plot on other systems.
svn path=/trunk/mono-tools/; revision=136051
Diffstat (limited to 'gsharp')
| -rw-r--r-- | gsharp/Makefile.am | 4 | ||||
| -rw-r--r-- | gsharp/SysDrawing.cs | 4 | ||||
| -rw-r--r-- | gsharp/gsharp.exe.config.in | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/gsharp/Makefile.am b/gsharp/Makefile.am index 45f5fc28..c6fd643f 100644 --- a/gsharp/Makefile.am +++ b/gsharp/Makefile.am @@ -1,7 +1,7 @@ gsharpdir = $(prefix)/lib/gsharp bin_SCRIPTS = gsharp -gsharp_DATA = gsharp.exe +gsharp_DATA = gsharp.exe gsharp.exe.config desktopdir = $(datadir)/applications desktop_DATA = gsharp.desktop @@ -26,7 +26,7 @@ gsharp_sources = \ $(srcdir)/gtk-gui/Mono.CSharp.Gui.DescribeType.cs \ $(srcdir)/outline.cs -EXTRA_DIST = $(gsharp_sources) gsharp.in $(desktop_DATA).in close.png +EXTRA_DIST = $(gsharp_sources) gsharp.in $(desktop_DATA).in close.png gsharp.exe.config.in CLEANFILES = $(gsharp_DATA) $(gsharp_DATA).mdb $(desktop_DATA) gsharp.exe: $(gsharp_sources) diff --git a/gsharp/SysDrawing.cs b/gsharp/SysDrawing.cs index 1b3919dc..15a95749 100644 --- a/gsharp/SysDrawing.cs +++ b/gsharp/SysDrawing.cs @@ -65,10 +65,10 @@ namespace Mono.CSharp.Gui public class GraphicsHelper { - [DllImport("libgdk-x11-2.0")] + [DllImport("libgdk-win32-2.0-0.dll")] internal static extern IntPtr gdk_x11_drawable_get_xdisplay (IntPtr raw); - [DllImport("libgdk-x11-2.0")] + [DllImport("libgdk-win32-2.0-0.dll")] internal static extern IntPtr gdk_x11_drawable_get_xid (IntPtr raw); public static System.Drawing.Graphics FromDrawable (Gdk.Drawable drawable) diff --git a/gsharp/gsharp.exe.config.in b/gsharp/gsharp.exe.config.in new file mode 100644 index 00000000..75550978 --- /dev/null +++ b/gsharp/gsharp.exe.config.in @@ -0,0 +1,3 @@ +<configuration> + <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0@LIB_PREFIX@.0@LIB_SUFFIX@"/> +</configuration> |