From 599be596c24727c3ccf293f7426672bf804ecd7e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 21 Sep 2000 16:17:32 +0000 Subject: Add gconvert.o. Use libiconv. 2000-09-21 Tor Lillqvist * 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. --- makefile.mingw.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'makefile.mingw.in') diff --git a/makefile.mingw.in b/makefile.mingw.in index 62eb80aca..6b7ad5b26 100644 --- a/makefile.mingw.in +++ b/makefile.mingw.in @@ -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 -- cgit v1.2.1