From: Tor Lillqvist Date: Fri, 1 Dec 2000 15:11:54 +0000 (+0000) Subject: Include make.msc from GLib's build subdir. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=74987b2cf0d7f8977aa9a7872f0feccbd4a212fd;p=dana%2Fcg-glib.git Include make.msc from GLib's build subdir. 2000-12-01 Tor Lillqvist * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. * glib.def: Update correspondingly. --- diff --git a/ChangeLog b/ChangeLog index 72f049d4..41e6843f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 72f049d4..41e6843f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2000-12-01 Tor Lillqvist + + * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. + + * glib.def: Update correspondingly. + 2000-11-21 Havoc Pennington * gmacros.h: Provide G_CONST_RETURN which is 'const' by default, diff --git a/glib.def b/glib.def index b7663686..f6a2ae01 100644 --- a/glib.def +++ b/glib.def @@ -508,6 +508,7 @@ EXPORTS g_tuples_destroy g_tuples_index g_ucs4_to_utf8 + g_unichar_break_type g_unichar_digit_value g_unichar_isalnum g_unichar_isalpha diff --git a/glib/glib.def b/glib/glib.def index b7663686..f6a2ae01 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -508,6 +508,7 @@ EXPORTS g_tuples_destroy g_tuples_index g_ucs4_to_utf8 + g_unichar_break_type g_unichar_digit_value g_unichar_isalnum g_unichar_isalpha diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in index d6912283..c8ff2156 100644 --- a/glib/makefile.mingw.in +++ b/glib/makefile.mingw.in @@ -76,6 +76,7 @@ glib_OBJECTS = \ gthreadpool.o \ gtimer.o \ gtree.o \ + gunibreak.o \ gunidecomp.o \ guniprop.o \ gutf8.o \ diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index f67422e2..7eaac1f5 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -7,7 +7,7 @@ BIN = C:\bin TOP = .. -!INCLUDE $(TOP)\build\win32\make.msc +!INCLUDE build\win32\make.msc # Possibly override GLib version in build\win32\module.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @@ -74,6 +74,7 @@ glib_OBJECTS = \ gthreadpool.obj \ gtimer.obj \ gtree.obj \ + gunibreak.obj \ gunidecomp.obj \ guniprop.obj \ gutf8.obj \ diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in index c9bfb17b..7bd97de7 100644 --- a/gmodule/makefile.msc.in +++ b/gmodule/makefile.msc.in @@ -3,7 +3,7 @@ TOP = ..\.. -!INCLUDE $(TOP)\build\win32\make.msc +!INCLUDE ..\build\win32\make.msc # Possibly override GLib version in build\win32\module.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in index db24b23d..ce8ce8e4 100644 --- a/gobject/makefile.msc.in +++ b/gobject/makefile.msc.in @@ -3,7 +3,7 @@ TOP = ..\.. -!INCLUDE $(TOP)\build\win32\make.msc +!INCLUDE ..\build\win32\make.msc # Possibly override GLib version in build\win32\object.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in index c000036d..5450af00 100644 --- a/gthread/makefile.msc.in +++ b/gthread/makefile.msc.in @@ -5,7 +5,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ TOP = ..\.. -!INCLUDE $(TOP)\build\win32\make.msc +!INCLUDE ..\build\win32\make.msc # Possibly override GLib version in build\win32\module.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ diff --git a/makefile.mingw.in b/makefile.mingw.in index d6912283..c8ff2156 100644 --- a/makefile.mingw.in +++ b/makefile.mingw.in @@ -76,6 +76,7 @@ glib_OBJECTS = \ gthreadpool.o \ gtimer.o \ gtree.o \ + gunibreak.o \ gunidecomp.o \ guniprop.o \ gutf8.o \ diff --git a/makefile.msc.in b/makefile.msc.in index f67422e2..7eaac1f5 100644 --- a/makefile.msc.in +++ b/makefile.msc.in @@ -7,7 +7,7 @@ BIN = C:\bin TOP = .. -!INCLUDE $(TOP)\build\win32\make.msc +!INCLUDE build\win32\make.msc # Possibly override GLib version in build\win32\module.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ @@ -74,6 +74,7 @@ glib_OBJECTS = \ gthreadpool.obj \ gtimer.obj \ gtree.obj \ + gunibreak.obj \ gunidecomp.obj \ guniprop.obj \ gutf8.obj \ diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in index 8d903662..8ecda355 100644 --- a/tests/makefile.msc.in +++ b/tests/makefile.msc.in @@ -3,7 +3,7 @@ TOP = ..\.. -!INCLUDE $(TOP)\build\win32\make.msc +!INCLUDE ..\build\win32\make.msc # Possibly override GLib version in build\win32\module.defs GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@