summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2000-12-01 15:11:54 +0000
committerTor Lillqvist <tml@src.gnome.org>2000-12-01 15:11:54 +0000
commit74987b2cf0d7f8977aa9a7872f0feccbd4a212fd (patch)
tree9809bca68310f57a7e7a9b54ad91d9d58c60f38a
parent430ae18e5be4267c00ea38542d885642f35e6714 (diff)
downloadglib-74987b2cf0d7f8977aa9a7872f0feccbd4a212fd.tar.gz
Include make.msc from GLib's build subdir.
2000-12-01 Tor Lillqvist <tml@iki.fi> * {.,*}/makefile.msc.in: Include make.msc from GLib's build subdir. * makefile.{mingw,msc}.in (glib_OBJECTS): Add gunibreak. * glib.def: Update correspondingly.
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-2-08
-rw-r--r--ChangeLog.pre-2-108
-rw-r--r--ChangeLog.pre-2-128
-rw-r--r--ChangeLog.pre-2-28
-rw-r--r--ChangeLog.pre-2-48
-rw-r--r--ChangeLog.pre-2-68
-rw-r--r--ChangeLog.pre-2-88
-rw-r--r--glib.def1
-rw-r--r--glib/glib.def1
-rw-r--r--glib/makefile.mingw.in1
-rw-r--r--glib/makefile.msc.in3
-rw-r--r--gmodule/makefile.msc.in2
-rw-r--r--gobject/makefile.msc.in2
-rw-r--r--gthread/makefile.msc.in2
-rw-r--r--makefile.mingw.in1
-rw-r--r--makefile.msc.in3
-rw-r--r--tests/makefile.msc.in2
18 files changed, 76 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 72f049d42..41e6843f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 72f049d42..41e6843f5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2000-12-01 Tor Lillqvist <tml@iki.fi>
+
+ * {.,*}/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 <hp@pobox.com>
* gmacros.h: Provide G_CONST_RETURN which is 'const' by default,
diff --git a/glib.def b/glib.def
index b76636866..f6a2ae01a 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 b76636866..f6a2ae01a 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 d69122831..c8ff21561 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 f67422e28..7eaac1f57 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 c9bfb17b2..7bd97de7f 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 db24b23dc..ce8ce8e46 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 c000036d5..5450af009 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 d69122831..c8ff21561 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 f67422e28..7eaac1f57 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 8d9036621..8ecda3555 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@
View Lorry Controller Status