+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>
* gthread-posix.c: Removed the G_THREAD_USE_PID_SURROGATE
makefile.msc \
gthread.rc
-libglib = $(top_builddir)/libglib.la # -lglib
+libglib = $(top_builddir)/libglib-1.3.la
top_builddir_full=`cd \$(top_builddir); pwd`
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_LDFLAGS = \
-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
cd $(top_builddir) && CONFIG_FILES=gthread/$@ CONFIG_HEADERS= $(SHELL) ./config.status
else
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));
#else
g_thread_functions_for_glib_use = *init;