diff options
| author | Tor Lillqvist <tml@iki.fi> | 2000-09-21 16:17:32 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2000-09-21 16:17:32 +0000 |
| commit | 599be596c24727c3ccf293f7426672bf804ecd7e (patch) | |
| tree | aaa4a1c125591a9cf2a2891c9d355e14b26e9e63 /gthread | |
| parent | 6ad8111de3610c6d8491925e9f35bb294162ae95 (diff) | |
Add gconvert.o. Use libiconv.
2000-09-21 Tor Lillqvist <tml@iki.fi>
* makefile.mingw.in: Add gconvert.o. Use libiconv.
* config.h.win32.in: Define HAVE_GETCWD.
* glib.def: Add new entry points.
* gthread/makefile.mingw.in: Use pthreads macros from ../build.
Diffstat (limited to 'gthread')
| -rw-r--r-- | gthread/ChangeLog | 4 | ||||
| -rw-r--r-- | gthread/makefile.mingw.in | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 7abe93c3a..5dcdffde2 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,7 @@ +2000-09-21 Tor Lillqvist <tml@iki.fi> + + * makefile.mingw.in: Use pthreads macros from ../build. + 2000-09-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de> * gthread-posix.c, gthread-solaris.c: diff --git a/gthread/makefile.mingw.in b/gthread/makefile.mingw.in index d0739dd87..7cfaa8d56 100644 --- a/gthread/makefile.mingw.in +++ b/gthread/makefile.mingw.in @@ -7,21 +7,15 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ TOP = ../.. -# This is the location of pthreads for Win32, -# see http://sourceware.cygnus.com/pthreads-win32/ -# We want the 1999-05-30 snapshot. -PTHREADS = $(TOP)/pthreads-snap-1999-05-30 -PTHREAD_LIBS = -L $(PTHREADS) -lpthread32 -PTHREAD_INC = -I $(PTHREADS) - include ../build/win32/make.mingw ################################################################ # Nothing much configurable below -INCLUDES = -I .. -I . $(PTHREAD_INC) +INCLUDES = -I .. -I . DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" +DEPCFLAGS = $(PTHREAD_CFLAGS) BUILD_DLL = ../build-dll |