luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-04 10:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use libglib-1.3.la from top_builddir. Invoke libtool with -no-undefined

Browse Source 
2001-02-21  Tor Lillqvist  <tml@iki.fi>

	* Makefile.am: Use libglib-1.3.la from top_builddir. Invoke
	libtool with -no-undefined for Win32 and Cygwin.

	* gthread-impl.c (g_thread_init): Win32 code snippet used also on
	Cygwin.
This commit is contained in:
Tor Lillqvist 2001-03-09 21:41:37 +00:00 committed by Tor Lillqvist
parent 137d3248c7
commit 9c5f5a01ce
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gthread/ChangeLog
View File

@ -1,3 +1,11 @@
2001-02-21 Tor Lillqvist <tml@iki.fi>
* Makefile.am: Use libglib-1.3.la from top_builddir. Invoke
libtool with -no-undefined for Win32 and Cygwin.
* gthread-impl.c (g_thread_init): Win32 code snippet used also on
Cygwin.
2001-02-15 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2001-02-15 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread-posix.c: Removed the G_THREAD_USE_PID_SURROGATE * gthread-posix.c: Removed the G_THREAD_USE_PID_SURROGATE

13
gthread/Makefile.am
View File

@ -18,18 +18,25 @@ BUILT_EXTRA_DIST = \
makefile.msc \ makefile.msc \
gthread.rc gthread.rc
libglib = $(top_builddir)/libglib.la # -lglib libglib = $(top_builddir)/libglib-1.3.la
top_builddir_full=`cd \$(top_builddir); pwd` top_builddir_full=`cd \$(top_builddir); pwd`
lib_LTLIBRARIES = libgthread-1.3.la lib_LTLIBRARIES = libgthread-1.3.la
if PLATFORM_WIN32
no_undefined = -no-undefined
endif
if OS_WIN32
export_symbols = -export-symbols gthread.def
endif
libgthread_1_3_la_SOURCES = gthread-impl.c libgthread_1_3_la_SOURCES = gthread-impl.c
libgthread_1_3_la_LDFLAGS = \ libgthread_1_3_la_LDFLAGS = \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-export-dynamic -export-dynamic $(no_undefined) $(export_symbols)
libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ libgthread_1_3_la_LIBADD = @G_THREAD_LIBS_EXTRA@ @G_THREAD_LIBS@ $(libglib)
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread/gthread.rc.in
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status

2
gthread/gthread-impl.c
View File

@ -318,7 +318,7 @@ g_thread_init (GThreadFunctions* init)
else else
g_thread_use_default_impl = FALSE; g_thread_use_default_impl = FALSE;
#if defined (G_OS_WIN32) && defined (__GNUC__) #if defined (G_PLATFORM_WIN32) && defined (__GNUC__)
memcpy(&g_thread_functions_for_glib_use, init, sizeof (*init)); memcpy(&g_thread_functions_for_glib_use, init, sizeof (*init));
#else #else
g_thread_functions_for_glib_use = *init; g_thread_functions_for_glib_use = *init;