From 599be596c24727c3ccf293f7426672bf804ecd7e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 21 Sep 2000 16:17:32 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ config.h.win32.in | 1 + glib.def | 7 +++++++ glib/glib.def | 7 +++++++ glib/makefile.mingw.in | 4 +++- gthread/ChangeLog | 4 ++++ gthread/makefile.mingw.in | 10 ++-------- makefile.mingw.in | 4 +++- 15 files changed, 91 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 111621c..03f93ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 111621c..03f93ad 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +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. + 2000-09-21 Sebastian Wilhelmi * configure.in: The last released automake (1.4) still requires diff --git a/config.h.win32.in b/config.h.win32.in index f7422fb..b06c600 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -27,6 +27,7 @@ /* #undef HAVE_BROKEN_WCTYPE */ /* #undef HAVE_DOPRNT */ #define HAVE_FLOAT_H 1 +#define HAVE_GETCWD 1 #define HAVE_LIMITS_H 1 /* #undef HAVE_LOCALTIME_R */ /* #undef HAVE_LONG_DOUBLE */ diff --git a/glib.def b/glib.def index d70288f..826ab92 100644 --- a/glib.def +++ b/glib.def @@ -35,6 +35,9 @@ EXPORTS g_completion_free g_completion_new g_completion_remove_items + g_convert + g_convert_error_quark + g_convert_with_fallback g_datalist_clear g_datalist_foreach g_datalist_id_get_data @@ -264,6 +267,7 @@ EXPORTS g_pipe_readable_msg g_print g_printerr + g_propagate_error g_printf_string_upper_bound g_ptr_array_add g_ptr_array_free @@ -440,6 +444,7 @@ EXPORTS g_strtod g_strup g_thread_create + g_thread_error_quark g_thread_functions_for_glib_use g_thread_join g_thread_pool_free @@ -468,6 +473,7 @@ EXPORTS g_tree_traverse g_tuples_destroy g_tuples_index + g_ucs4_to_utf8 g_unichar_digit_value g_unichar_isalnum g_unichar_isalpha @@ -503,6 +509,7 @@ EXPORTS g_utf8_strlen g_utf8_strncpy g_utf8_to_ucs4 + g_utf8_validate g_vsnprintf g_win32_closedir g_win32_error_message diff --git a/glib/glib.def b/glib/glib.def index d70288f..826ab92 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -35,6 +35,9 @@ EXPORTS g_completion_free g_completion_new g_completion_remove_items + g_convert + g_convert_error_quark + g_convert_with_fallback g_datalist_clear g_datalist_foreach g_datalist_id_get_data @@ -264,6 +267,7 @@ EXPORTS g_pipe_readable_msg g_print g_printerr + g_propagate_error g_printf_string_upper_bound g_ptr_array_add g_ptr_array_free @@ -440,6 +444,7 @@ EXPORTS g_strtod g_strup g_thread_create + g_thread_error_quark g_thread_functions_for_glib_use g_thread_join g_thread_pool_free @@ -468,6 +473,7 @@ EXPORTS g_tree_traverse g_tuples_destroy g_tuples_index + g_ucs4_to_utf8 g_unichar_digit_value g_unichar_isalnum g_unichar_isalpha @@ -503,6 +509,7 @@ EXPORTS g_utf8_strlen g_utf8_strncpy g_utf8_to_ucs4 + g_utf8_validate g_vsnprintf g_win32_closedir g_win32_error_message diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in index 62eb80a..6b7ad5b 100644 --- a/glib/makefile.mingw.in +++ b/glib/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 diff --git a/gthread/ChangeLog b/gthread/ChangeLog index 7abe93c..5dcdffd 100644 --- a/gthread/ChangeLog +++ b/gthread/ChangeLog @@ -1,3 +1,7 @@ +2000-09-21 Tor Lillqvist + + * makefile.mingw.in: Use pthreads macros from ../build. + 2000-09-06 Sebastian Wilhelmi * gthread-posix.c, gthread-solaris.c: diff --git a/gthread/makefile.mingw.in b/gthread/makefile.mingw.in index d0739dd..7cfaa8d 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 diff --git a/makefile.mingw.in b/makefile.mingw.in index 62eb80a..6b7ad5b 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 -- 2.7.4