projects / dana / cg-glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ad8111)
Add gconvert.o. Use libiconv.
authorTor Lillqvist <tml@iki.fi>
Thu, 21 Sep 2000 16:17:32 +0000 (16:17 +0000)
committerTor Lillqvist <tml@src.gnome.org>
Thu, 21 Sep 2000 16:17:32 +0000 (16:17 +0000)
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.

15 files changed:
ChangeLog patch | blob | history
ChangeLog.pre-2-0 patch | blob | history
ChangeLog.pre-2-10 patch | blob | history
ChangeLog.pre-2-12 patch | blob | history
ChangeLog.pre-2-2 patch | blob | history
ChangeLog.pre-2-4 patch | blob | history
ChangeLog.pre-2-6 patch | blob | history
ChangeLog.pre-2-8 patch | blob | history
config.h.win32.in patch | blob | history
glib.def patch | blob | history
glib/glib.def patch | blob | history
glib/makefile.mingw.in patch | blob | history
gthread/ChangeLog patch | blob | history
gthread/makefile.mingw.in patch | blob | history
makefile.mingw.in patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 111621cab93e21ef674cded074c556e1386d7232..03f93adb544c7bc82c2a00850db6b15bb35f8931 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * configure.in: The last released automake (1.4) still requires
diff --git a/config.h.win32.in b/config.h.win32.in
index f7422fbde87519c4febb28369305124a02d18e4e..b06c600b5f52b75cd7f708554f8aa22a1fba98f2 100644 (file)
--- 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 d70288f6b85be90cd95017a4cea53d5c80536a33..826ab92c42aed697a48449de6efa8a7509717698 100644 (file)
--- 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 d70288f6b85be90cd95017a4cea53d5c80536a33..826ab92c42aed697a48449de6efa8a7509717698 100644 (file)
--- 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 62eb80acad2bbd77330e1272ec5b5e9637488564..6b7ad5b267d956a0eb1cc5ac5df5c999fd2599d5 100644 (file)
--- 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 7abe93c3ae7c3a17cd5f6c785ea44aa494c1d5d3..5dcdffde2a245a6f7c358dcff4e823a6c582e00c 100644 (file)
--- 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 d0739dd87c1024e2fcc17bc87a7a5ada476cace6..7cfaa8d56bfed3395563ae9054d6f885045a55e6 100644 (file)
--- 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 62eb80acad2bbd77330e1272ec5b5e9637488564..6b7ad5b267d956a0eb1cc5ac5df5c999fd2599d5 100644 (file)
--- 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
 
Improved data structures for GLib. Specifically, a persistent version of the GTree.