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.
This commit is contained in:
Tor Lillqvist
2000-09-21 16:17:32 +00:00
committed by Tor Lillqvist
parent 6ad8111de3
commit 599be596c2
15 changed files with 91 additions and 10 deletions

View File

@@ -19,6 +19,7 @@ include build/win32/make.mingw
INCLUDES = -I .
DEFINES = -DHAVE_CONFIG_H -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib
DEPCFLAGS = $(LIBICONV_CFLAGS)
DLLS_TO_BUILD = \
glib-$(GLIB_VER).dll \
@@ -44,6 +45,7 @@ glib_OBJECTS = \
gbacktrace.o \
gcache.o \
gcompletion.o \
gconvert.o \
gdataset.o \
gdate.o \
gerror.o \
@@ -87,7 +89,7 @@ makefile.mingw: makefile.mingw.in
################ glib
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) -luser32 -lwsock32
./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) $(LIBICONV_LIBS) -luser32 -lwsock32
################ subdirectories