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

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -1,3 +1,11 @@
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.
2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de> 2000-09-21 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: The last released automake (1.4) still requires * configure.in: The last released automake (1.4) still requires

View File

@ -27,6 +27,7 @@
/* #undef HAVE_BROKEN_WCTYPE */ /* #undef HAVE_BROKEN_WCTYPE */
/* #undef HAVE_DOPRNT */ /* #undef HAVE_DOPRNT */
#define HAVE_FLOAT_H 1 #define HAVE_FLOAT_H 1
#define HAVE_GETCWD 1
#define HAVE_LIMITS_H 1 #define HAVE_LIMITS_H 1
/* #undef HAVE_LOCALTIME_R */ /* #undef HAVE_LOCALTIME_R */
/* #undef HAVE_LONG_DOUBLE */ /* #undef HAVE_LONG_DOUBLE */

View File

@ -35,6 +35,9 @@ EXPORTS
g_completion_free g_completion_free
g_completion_new g_completion_new
g_completion_remove_items g_completion_remove_items
g_convert
g_convert_error_quark
g_convert_with_fallback
g_datalist_clear g_datalist_clear
g_datalist_foreach g_datalist_foreach
g_datalist_id_get_data g_datalist_id_get_data
@ -264,6 +267,7 @@ EXPORTS
g_pipe_readable_msg g_pipe_readable_msg
g_print g_print
g_printerr g_printerr
g_propagate_error
g_printf_string_upper_bound g_printf_string_upper_bound
g_ptr_array_add g_ptr_array_add
g_ptr_array_free g_ptr_array_free
@ -440,6 +444,7 @@ EXPORTS
g_strtod g_strtod
g_strup g_strup
g_thread_create g_thread_create
g_thread_error_quark
g_thread_functions_for_glib_use g_thread_functions_for_glib_use
g_thread_join g_thread_join
g_thread_pool_free g_thread_pool_free
@ -468,6 +473,7 @@ EXPORTS
g_tree_traverse g_tree_traverse
g_tuples_destroy g_tuples_destroy
g_tuples_index g_tuples_index
g_ucs4_to_utf8
g_unichar_digit_value g_unichar_digit_value
g_unichar_isalnum g_unichar_isalnum
g_unichar_isalpha g_unichar_isalpha
@ -503,6 +509,7 @@ EXPORTS
g_utf8_strlen g_utf8_strlen
g_utf8_strncpy g_utf8_strncpy
g_utf8_to_ucs4 g_utf8_to_ucs4
g_utf8_validate
g_vsnprintf g_vsnprintf
g_win32_closedir g_win32_closedir
g_win32_error_message g_win32_error_message

View File

@ -35,6 +35,9 @@ EXPORTS
g_completion_free g_completion_free
g_completion_new g_completion_new
g_completion_remove_items g_completion_remove_items
g_convert
g_convert_error_quark
g_convert_with_fallback
g_datalist_clear g_datalist_clear
g_datalist_foreach g_datalist_foreach
g_datalist_id_get_data g_datalist_id_get_data
@ -264,6 +267,7 @@ EXPORTS
g_pipe_readable_msg g_pipe_readable_msg
g_print g_print
g_printerr g_printerr
g_propagate_error
g_printf_string_upper_bound g_printf_string_upper_bound
g_ptr_array_add g_ptr_array_add
g_ptr_array_free g_ptr_array_free
@ -440,6 +444,7 @@ EXPORTS
g_strtod g_strtod
g_strup g_strup
g_thread_create g_thread_create
g_thread_error_quark
g_thread_functions_for_glib_use g_thread_functions_for_glib_use
g_thread_join g_thread_join
g_thread_pool_free g_thread_pool_free
@ -468,6 +473,7 @@ EXPORTS
g_tree_traverse g_tree_traverse
g_tuples_destroy g_tuples_destroy
g_tuples_index g_tuples_index
g_ucs4_to_utf8
g_unichar_digit_value g_unichar_digit_value
g_unichar_isalnum g_unichar_isalnum
g_unichar_isalpha g_unichar_isalpha
@ -503,6 +509,7 @@ EXPORTS
g_utf8_strlen g_utf8_strlen
g_utf8_strncpy g_utf8_strncpy
g_utf8_to_ucs4 g_utf8_to_ucs4
g_utf8_validate
g_vsnprintf g_vsnprintf
g_win32_closedir g_win32_closedir
g_win32_error_message g_win32_error_message

View File

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

View File

@ -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> 2000-09-06 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gthread-posix.c, gthread-solaris.c: * gthread-posix.c, gthread-solaris.c:

View File

@ -7,21 +7,15 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ../.. 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 include ../build/win32/make.mingw
################################################################ ################################################################
# Nothing much configurable below # Nothing much configurable below
INCLUDES = -I .. -I . $(PTHREAD_INC) INCLUDES = -I .. -I .
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
DEPCFLAGS = $(PTHREAD_CFLAGS)
BUILD_DLL = ../build-dll BUILD_DLL = ../build-dll

View File

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