Kill libglibsharpglue.

* configure.ac: remove glib/glue/Makefile expansion * glib/Makefile.am: remove glue SUBDIR * glib/Thread.cs: move to non-glue supported check * glib/glue: kill
mono · Jan 8, 2011 · ea7c52b · ea7c52b
1 parent 3e0df87
commit ea7c52b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 72 deletions.
diff --git a/configure.ac b/configure.ac
@@ -224,7 +224,6 @@ generator/gapi3-codegen
 glib/Makefile
 glib/glib-sharp-3.0.pc
 glib/glib-sharp.dll.config
-glib/glue/Makefile
 gio/Makefile
 gio/gio-sharp-3.0.pc
 gio/gio-sharp.dll.config

diff --git a/glib/Makefile.am b/glib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = glue
+SUBDIRS =
 
 TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll

diff --git a/glib/Thread.cs b/glib/Thread.cs
@@ -36,13 +36,13 @@ public static void Init ()
 			g_thread_init (IntPtr.Zero);
 		}
 
-		[DllImport("glibsharpglue-3")]
-		static extern bool glibsharp_g_thread_supported ();
+		[DllImport ("libgthread-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+		static extern bool g_thread_get_initialized ();
 
 		public static bool Supported
 		{
 			get {
-				return glibsharp_g_thread_supported ();
+				return g_thread_get_initialized ();
 			}
 		}
 	}

diff --git a/glib/glue/Makefile.am b/glib/glue/Makefile.am
diff --git a/glib/glue/thread.c b/glib/glue/thread.c
diff --git a/glib/glue/win32dll.c b/glib/glue/win32dll.c