ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-01-11 16:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kill libglibsharpglue.

Browse source 
* 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
This commit is contained in:
Mike Kestner 2011-01-07 21:22:35 -06:00
parent 3e0df87118
commit ea7c52bbf9
6 changed files with 4 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -224,7 +224,6 @@ generator/gapi3-codegen
glib/Makefile glib/Makefile
glib/glib-sharp-3.0.pc glib/glib-sharp-3.0.pc
glib/glib-sharp.dll.config glib/glib-sharp.dll.config
glib/glue/Makefile
gio/Makefile gio/Makefile
gio/gio-sharp-3.0.pc gio/gio-sharp-3.0.pc
gio/gio-sharp.dll.config gio/gio-sharp.dll.config

2
glib/Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = glue SUBDIRS =
TARGET = $(ASSEMBLY) TARGET = $(ASSEMBLY)
ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY = $(ASSEMBLY_NAME).dll

6
glib/Thread.cs
View file

@ -36,13 +36,13 @@ namespace GLib
g_thread_init (IntPtr.Zero); g_thread_init (IntPtr.Zero);
} }
[DllImport("glibsharpglue-3")] [DllImport ("libgthread-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
static extern bool glibsharp_g_thread_supported (); static extern bool g_thread_get_initialized ();
public static bool Supported public static bool Supported
{ {
get { get {
return glibsharp_g_thread_supported (); return g_thread_get_initialized ();
} }
} }
} }

19
glib/glue/Makefile.am
View file

@ -1,19 +0,0 @@
lib_LTLIBRARIES = libglibsharpglue-3.la
libglibsharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
libglibsharpglue_3_la_SOURCES = \
thread.c
# Adding a new glue file?
libglibsharpglue_3_la_LIBADD = $(GLIB_LIBS)
INCLUDES = $(GLIB_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
libglibsharpglue.dll: $(libglibsharpglue_3_la_OBJECTS) libglibsharpglue.rc libglibsharpglue.def
./build-dll libglibsharpglue-3 $(VERSION)
CLEANFILES = lib*.a lib*.dll
EXTRA_DIST = win32dll.c

32
glib/glue/thread.c
View file

@ -1,32 +0,0 @@
/* thread.c : glue functions for GLib.Thread
*
* Author: Alp Toker <alp@atoker.com>
*
* Copyright (c) 2005 Alp Toker
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the Lesser GNU General
* Public License as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
#include <glib/gthread.h>
gboolean glibsharp_g_thread_supported (void);
gboolean
glibsharp_g_thread_supported ()
{
return g_thread_supported ();
}

16
glib/glue/win32dll.c
View file

@ -1,16 +0,0 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <stdio.h>
BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
/*
BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
{
return TRUE;
}
*/