diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2009-06-13 02:33:02 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2009-06-13 02:33:02 +0400 |
| commit | dc8d25b2547faf197ca174acd87a0a24434bec78 (patch) | |
| tree | 2b76fe7db7c3531c894690c5c49e49e97496bbe7 | |
| parent | 27bf322446720506ddeb77cd2b62c66bc4c9bb13 (diff) | |
Backportificate
svn path=/branches/mono-2-4/mono-tools/; revision=136053
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | gsharp/Makefile.am | 4 | ||||
| -rw-r--r-- | gsharp/SysDrawing.cs | 4 |
4 files changed, 20 insertions, 4 deletions
@@ -6,6 +6,11 @@ * Makefile.am: Add webdoc to the build. +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. + 2008-12-02 Sebastien Pouliot <sebastien@ximian.com> * configure.in: Remove AC_OUTPUT on gnunit files since they break diff --git a/configure.in b/configure.in index e5904a1d..a97752af 100644 --- a/configure.in +++ b/configure.in @@ -116,6 +116,16 @@ if test -z "$CONFIG_REQUESTED" ; then enable_debug=yes fi +if test `uname -s` = "Darwin"; then + LIB_PREFIX= + LIB_SUFFIX=.dylib +else + LIB_PREFIX=.so + LIB_SUFFIX= +fi +AC_SUBST(LIB_PREFIX) +AC_SUBST(LIB_SUFFIX) + dnl dnl I hate PKG_CONFIG_MODULES, that is for the weak dnl @@ -157,6 +167,7 @@ AC_OUTPUT([ Makefile gsharp/Makefile gsharp/gsharp +gsharp/gsharp.exe.config gui-compare/Makefile gui-compare/gui-compare mperfmon/Makefile 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) |